代码优化

pom.xml

@@ -252,6 +252,7 @@
                                     <directory>src/main/resources</directory>
                                     <filtering>true</filtering>
                                     <includes>
+                                        <include>bin/*.bat</include>
                                         <include>bin/*.xml</include>
                                         <include>*.yml</include>
                                     </includes>
@@ -331,4 +332,4 @@
 
 
 
-</project>
+</project>

src/main/java/com/docus/server/collection/dto/TBasicDto.java

@@ -24,4 +24,8 @@ public class TBasicDto {
     private String admissDeptName ;
     private String disDeptName ;
     private String attendingName;
+    private String age;
+    private String sex;
+    private String idCard;
+    private String disDept;
 }

src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java

@@ -47,6 +47,13 @@ public class TBasicServiceImpl implements ITBasicService {
         if(NumberUtil.isInteger(admissTimesStr)){
             admissTimes=Integer.parseInt(admissTimesStr);
         }
+        String ageStr = tBasicDto.getAge();
+        ageStr =ageStr.substring(0,ageStr.length()-1);
+        System.out.println(ageStr);
+        Integer age=null;
+        if(NumberUtil.isInteger(ageStr)){
+            age=Integer.parseInt(ageStr);
+        }
 
         //组装数据
         TBasic tBasic=new TBasic();
@@ -60,6 +67,10 @@ public class TBasicServiceImpl implements ITBasicService {
         tBasic.setAdmissDeptName(tBasicDto.getAdmissDeptName());
         tBasic.setDisDeptName(tBasicDto.getDisDeptName());
         tBasic.setAttendingName(tBasicDto.getAttendingName());
+        tBasic.setAge(age);
+        tBasic.setSex(tBasicDto.getSex());
+        tBasic.setIdCard(tBasicDto.getIdCard());
+        tBasic.setDisDept(tBasicDto.getDisDept());
 
         //持久化
         tBasicMapper.insert(tBasic);

src/main/java/com/docus/server/collection/webservice/impl/BasicServiceImpl.java

@@ -123,6 +123,30 @@ public class BasicServiceImpl implements BasicService {
         if(Func.isNotEmpty(attendingNameNode)){
             attendingName=attendingNameNode.getTextContent();
         }
+        //年龄
+        String age=null;
+        Node ageNode = xml.getNode("//PRPA_HIP0032/controlActProcess/subject/encounterEvent/subject/patient/patientPerson/age[@unit='岁']/@value");
+        if(Func.isNotEmpty(ageNode)){
+            age=ageNode.getNodeValue();
+        }
+        //性别
+        String sex=null;
+        Node sexNode = xml.getNode("//PRPA_HIP0032/controlActProcess/subject/encounterEvent/subject/patient/patientPerson/administrativeGenderCode/@code");
+        if(Func.isNotEmpty(sexNode)){
+            sex=sexNode.getNodeValue();
+        }
+        //身份证号
+        String idCard=null;
+        Node idCardNode = xml.getNode("//PRPA_HIP0032/controlActProcess/subject/encounterEvent/subject/patient/patientPerson/id/item/@extension");
+        if(Func.isNotEmpty(idCardNode)){
+            idCard=idCardNode.getNodeValue();
+        }
+        //出院科室
+        String disDept=null;
+        Node disDeptCardNode = xml.getNode("//PRPA_HIP0032/controlActProcess/subject/encounterEvent/componentOf/encompassingEncounter/location/healthCareFacility/serviceProviderOrganization/asOrganizationPartOf/wholeOrganization/asOrganizationPartOf/wholeOrganization/asOrganizationPartOf/wholeOrganization/id/@extension");
+        if(Func.isNotEmpty(disDeptCardNode)){
+            disDept=disDeptCardNode.getNodeValue();
+        }
 
         //设置dto
         TBasicDto dto=new TBasicDto();
@@ -138,7 +162,10 @@ public class BasicServiceImpl implements BasicService {
         dto.setDisDate(disDate);
         dto.setAdmissTimes(admissTimes);
         dto.setAttendingName(attendingName);
-
+        dto.setAge(age);
+        dto.setSex(sex);
+        dto.setIdCard(idCard);
+        dto.setDisDept(disDept);
         return dto;
     }
 }

src/main/resources/mapper/TBasicMapper.xml

@@ -5,9 +5,9 @@
 <mapper namespace="com.docus.server.collection.mapper.TBasicMapper">
     <insert id="insert">
         INSERT INTO `docus_medicalrecord`.`t_basic`
-        (`patient_id`, `admiss_times`, `inpatient_no`,`name`,  `admiss_date`,  `admiss_dept_name`, `dis_date`, `dis_dept_name`,`attending_name`,`jzh`)
+        (`age`,`sex`,`id_card`,`dis_dept`,`patient_id`, `admiss_times`, `inpatient_no`,`name`,  `admiss_date`,  `admiss_dept_name`, `dis_date`, `dis_dept_name`,`attending_name`,`jzh`)
         VALUES
-        (#{tBasic.patientId},#{tBasic.admissTimes},#{tBasic.inpatientNo},#{tBasic.name},
+        (#{tBasic.age},#{tBasic.sex},#{tBasic.idCard},#{tBasic.disDept},#{tBasic.patientId},#{tBasic.admissTimes},#{tBasic.inpatientNo},#{tBasic.name},
         #{tBasic.admissDate},#{tBasic.admissDeptName},#{tBasic.disDate},#{tBasic.disDeptName},#{tBasic.attendingName},#{tBasic.jzh})
     </insert>
 

src/test/java/com/docus/server/collection/webservice/impl/DeptServerImplTest.java

@@ -121,9 +121,9 @@ public class DeptServerImplTest {
 
     @Test
     public void modifyWebserviceTest() throws Exception{
-        JaxWsDynamicClientFactory jaxWsDynamicClientFactory = JaxWsDynamicClientFactory.newInstance();
-        Client client = jaxWsDynamicClientFactory.createClient("http://localhost:9111/webservice/api/dept?wsdl");
-        Object[] invoke = client.invoke("deptModify", xml);
-        System.out.println(invoke[0].toString());
+//        JaxWsDynamicClientFactory jaxWsDynamicClientFactory = JaxWsDynamicClientFactory.newInstance();
+//        Client client = jaxWsDynamicClientFactory.createClient("http://localhost:9111/webservice/api/dept?wsdl");
+//        Object[] invoke = client.invoke("deptModify", xml);
+//        System.out.println(invoke[0].toString());
     }
 }

src/test/java/com/docus/server/collection/webservice/impl/UserServerImplTest.java

@@ -133,9 +133,9 @@ public class UserServerImplTest {
 
     @Test
     public void modifyWebserviceTest() throws Exception{
-        JaxWsDynamicClientFactory jaxWsDynamicClientFactory = JaxWsDynamicClientFactory.newInstance();
-        Client client = jaxWsDynamicClientFactory.createClient("http://localhost:9111/webservice/api/user?wsdl");
-        Object[] invoke = client.invoke("userModify", xml);
-        System.out.println(invoke[0].toString());
+//        JaxWsDynamicClientFactory jaxWsDynamicClientFactory = JaxWsDynamicClientFactory.newInstance();
+//        Client client = jaxWsDynamicClientFactory.createClient("http://localhost:9111/webservice/api/user?wsdl");
+//        Object[] invoke = client.invoke("userModify", xml);
+//        System.out.println(invoke[0].toString());
     }
 }