Browse Source

寓健代码修改

lipc 6 years atrás
parent
commit
0f2455947d

+ 39 - 0
tran-service/pom.xml

@@ -19,6 +19,45 @@
     </parent>
 
     <dependencies>
+        <!-- https://mvnrepository.com/artifact/javax.activation/activation -->
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/javax.mail/javax.mail-api -->
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>javax.mail-api</artifactId>
+            <version>1.5.6</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/javax.xml/jaxrpc-api -->
+        <!-- https://mvnrepository.com/artifact/javax.xml/jaxrpc -->
+        <dependency>
+            <groupId>javax.xml</groupId>
+            <artifactId>jaxrpc</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.axis/axis -->
+        <dependency>
+            <groupId>org.apache.axis</groupId>
+            <artifactId>axis</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/commons-discovery/commons-discovery -->
+        <dependency>
+            <groupId>commons-discovery</groupId>
+            <artifactId>commons-discovery</artifactId>
+            <version>0.2</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/wsdl4j/wsdl4j -->
+        <dependency>
+            <groupId>wsdl4j</groupId>
+            <artifactId>wsdl4j</artifactId>
+            <version>1.6.3</version>
+        </dependency>
         <dependency>
             <groupId>com.metaparadigm</groupId>
             <artifactId>json-rpc</artifactId>

+ 5 - 4
tran-service/src/main/java/com/diagbot/facade/PatientInfoFacade.java

@@ -126,13 +126,13 @@ public class PatientInfoFacade extends PatientInfoServiceImpl {
 
         String reqXml = JaxbUtil.convertToXml(body);
         System.out.println("请求Xml : " + reqXml);
-        WebServicesPortTypeProxy proxy = new WebServicesPortTypeProxy("http://118.31.73.190:8081/APP_Webservicesfuzl/service/WebServices");
+        WebServicesPortTypeProxy proxy = new WebServicesPortTypeProxy("http://116.62.126.198:8089/APP_Webservicesfuzl/service/WebServices");
         String resXml=proxy.ICSS_GET_PATIENT(reqXml);
         System.out.println("返回 Xml : " + resXml);
 
 
         //接口调用信息记录
-        HttpApi<InterfaceResponse> api = new HttpApi<InterfaceResponse>();
+        /*HttpApi<InterfaceResponse> api = new HttpApi<InterfaceResponse>();
         InterfaceInfoWrapper interfaces = new InterfaceInfoWrapper();
         interfaces.setHospitalId(patientInfoVO.getHospitalCode());
         interfaces.setDoctorNo(patientInfoVO.getDoctorCode());
@@ -142,7 +142,7 @@ public class PatientInfoFacade extends PatientInfoServiceImpl {
         interfaces.setParamOut(resXml);
         interfaces.setTransTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
         interfaces.setRemark("江干寓健");
-        api.doPost("http://localhost:8082/note-web/interfaces/record", interfaces, InterfaceResponse.class);
+        api.doPost("http://localhost:8082/note-web/interfaces/record", interfaces, InterfaceResponse.class);*/
 
 
         //将返回的xml格式的数据拆包
@@ -152,11 +152,12 @@ public class PatientInfoFacade extends PatientInfoServiceImpl {
         if(resBody!=null){
             if(resBody.getRet()==0){
                 HISPatient hISPatien = resBody.getData();
+                patientInfo.setHospitalCode(patientInfoVO.getHospitalCode());
                 patientInfo.setCode(patientInfoVO.getPatientCode());
                 patientInfo.setName(hISPatien.getPatName());
                 patientInfo.setSex(Integer.parseInt(hISPatien.getPatSex()));
                 if (hISPatien.getPatBirthday() != null) {
-                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
                     patientInfo.setBirthday(sdf.parse(hISPatien.getPatBirthday()));
                 }
                 //patientInfo.setIdType("");

+ 8 - 14
tran-service/src/main/java/com/diagbot/web/PatientInfoController.java

@@ -1,19 +1,6 @@
 package com.diagbot.web;
 
 
-import java.rmi.RemoteException;
-import java.text.ParseException;
-import java.util.List;
-import java.util.Map;
-
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.PatientInfoDTO;
@@ -22,10 +9,17 @@ import com.diagbot.entity.PatientInfo;
 import com.diagbot.facade.PatientInfoFacade;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.PatientInfoVO;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>

+ 1 - 1
tran-service/src/main/java/com/diagbot/yujian/response/PatientInfoResponseBody.java

@@ -12,7 +12,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 @Getter
 @Setter
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement(name = "root")
+@XmlRootElement(name = "ROOT")
 public class PatientInfoResponseBody<T> implements java.io.Serializable {
 
 	private static final long serialVersionUID = 1L;