同步提交对应文件表数据

src/main/java/com/emr/controller/ArchiveOtherExtController.java

@@ -93,7 +93,9 @@ public class ArchiveOtherExtController {
     @RequestMapping("submitUpdate1")
     @ResponseBody
     public Msg submitUpdate1(String ids){
+
         archiveOtherExtService.updateSubmit1(ids);
+
         return Msg.success();
     }
 

src/main/java/com/emr/dao/ArchiveOtherExtMapper.java

@@ -27,7 +27,11 @@ public interface ArchiveOtherExtMapper {
 
     int updateSubmit(@Param("ids")String ids);
 
+    List<ArchiveOtherExtVo> selectDiD(@Param("ids") String ids);
 
+    List<ArchiveOtherExtVo> selectDetailByDid(@Param("did") String did);
+
+    int delDetailByDid(@Param("did") String did);
     /**
      * 根据ids字段的查询与同步更新比较时间比较较晚时间的集合
      * @param ids

src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java

@@ -150,7 +150,14 @@ public class ArchiveOtherExtService {
     }
 
         public void  updateSubmit1(String ids){
-            //定义需要新增的集合
+            List<ArchiveOtherExtVo> archiveOtherExtVos = archiveOtherExtMapper.selectDiD(ids);
+            for (ArchiveOtherExtVo a:archiveOtherExtVos){
+                String did = a.getDid();
+                List<ArchiveOtherExtVo> archiveOtherExtVos1 = archiveOtherExtMapper.selectDetailByDid(did);
+                if (archiveOtherExtVos1.size()>0){
+                    archiveOtherExtMapper.delDetailByDid(did);
+                }
+            }
             archiveOtherExtMapper.updateSubmit(ids);
     }
 

src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java

@@ -1235,9 +1235,9 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
         }
         Archive_Master archive_master_vos = archive_masterVos.get(0);
         CommomVo commomVo=new CommomVo();
-            commomVo.setPatientId(archive_master_vos.getPatientId());
+            commomVo.setPatientId(archive_master_vos.getId());
             commomVo.setAdmissTimes(archive_master_vos.getVisitId());
-            commomVo.setAdmissId(archive_master_vos.getId());
+            commomVo.setAdmissId(archive_master_vos.getInpNo());
             commomVo.setInpatientNo(archive_master_vos.getInpNo());
             commomVo.setName(archive_master_vos.getName());
             commomVo.setCheckedDatetime(format1.format(new Date()));
@@ -1267,10 +1267,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
         int i1 = i * 12;
         String s = String.valueOf(i1);
         commomVo.setAgeMonth(s);
-//            int i2 = Integer.parseInt(substring);
-//            int i3 = i2 * 12;
-//            String s = String.valueOf(i3);
-//            commomVo.setAgeMonth(s);
             commomVo.setAdmissDate(archive_master_vos.getAdmissionDateTime());
             commomVo.setDisDate(archive_master_vos.getDischargeDateTime());
             commomVo.setDisDept(archive_master_vos.getDeptName1());

src/main/resources/config/config.properties

@@ -2,8 +2,8 @@
 #POWER_IP = localhost
 #POWER_PORT = 8081
 
-POWER_IP = 200.100.104.40
-POWER_PORT = 8081
+POWER_IP = localhost
+POWER_PORT = 8082
 
 #power\u6743\u9650\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934
 POWER_URLHEAD = http://${POWER_IP}:${POWER_PORT}/power

src/main/resources/config/jdbc.properties

@@ -3,7 +3,7 @@ dataBaseIp=localhost
 #\u6570\u636E\u5E93\u540D\u79F0
 dataBaseName=gm_record
 #\u6570\u636E\u5E93\u5BC6\u7801
-dataBasePassword=docus702
+dataBasePassword=admin123
 
 #\u6570\u636E\u5E93IP
 #dataBaseIp=200.100.104.40

src/main/resources/mapper/ArchiveOtherExtMapper.xml

@@ -52,6 +52,10 @@
     delete from archive_other_ext
     where ID = #{id,jdbcType=BIGINT}
   </delete>
+  <delete id="delDetailByDid" parameterType="java.lang.String">
+     delete from archive_detail
+    where ID = #{did}
+  </delete>
   <insert id="insert" parameterType="com.emr.entity.ArchiveOtherExt" >
     insert into archive_other_ext (ID, SycTime, SycObj, 
       otherID, sysFlag, sysUpdateTime, 
@@ -800,9 +804,18 @@
         and statusFlag =2 AND  statusFlag !=0
 
     </select>
+  <select id="selectDiD" resultType="com.emr.vo.ArchiveOtherExtVo" parameterType="java.lang.String">
+    select *
+        from archive_other_ext
+        where id in (${ids})
+        AND  sysFlag=15 and DID!='' and DID is not null
+  </select>
+  <select id="selectDetailByDid" resultType="com.emr.vo.ArchiveOtherExtVo" parameterType="java.lang.String">
+    select * from archive_detail where id=#{did}
+  </select>
 
 
-    <!--出院日期范围的功能查询语句-->
+  <!--出院日期范围的功能查询语句-->
   <sql id="disDateRangeWhereSql">
     <choose>
       <when test="startDateTo != null and startDateTo != '' and endDateTo != null and endDateTo != ''">

src/main/resources/mapper/Archive_MasterMapper.xml

@@ -1750,9 +1750,9 @@
     </select>
     <select id="selectCommonlyUsed" resultMap="BaseResultMap"
             parameterType="java.lang.String">
-        select *,f.Name as deptName1 from  archive_master m
-        left join emr_dictionary f
-        on f.code=m.dept_name
+        select *,emr_dictionary.Name as deptName1 from  archive_master
+   LEFT JOIN emr_dictionary ON archive_master.dept_name = emr_dictionary. CODE
+        AND emr_dictionary.parent_id = 'dept_code'
          where patient_id=#{patientId}
     </select>