医共体数据添加

postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfoimportmain/PatientInfoImportMainController.java

@@ -43,7 +43,7 @@ public class PatientInfoImportMainController extends BaseController {
     }
 
     /**
-     * 查询患者信息列表
+     * 删除批次患者导入信息列表
      */
     @ApiOperation("删除批次患者导入信息列表")
     @PostMapping("/updateSn")

postdischarge-manage/src/main/java/com/xinelu/manage/domain/externalimport/ExternalImport.java

@@ -75,6 +75,13 @@ public class ExternalImport extends BaseEntity {
     @Excel(name = "所属科室名称")
     private String departmentName;
 
+    /**
+     * 就诊编号
+     */
+    @ApiModelProperty(value = "就诊编号")
+    @Excel(name = "就诊编号")
+    private String visitCode;
+
     /**
      * 就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL
      */

postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfoimportmain/impl/PatientInfoImportMainServiceImpl.java

@@ -36,14 +36,8 @@ public class PatientInfoImportMainServiceImpl implements IPatientInfoImportMainS
 
     @DataScope(agencyAlias = "p")
     @Override
-    public List<PatientInfoImportMainVO> GetPatientInfoImport(PatientInfoImportMainVO patientInfoImport2VO)
+    public List<PatientInfoImportMainVO> GetPatientInfoImport(PatientInfoImportMainVO patientInfoImport2VO) {
-    {
+        return patientInfoImportMainMapper.GetPatientInfoImport(patientInfoImport2VO);
-         List<PatientInfoImportMainVO>  list = new ArrayList<>();
-
-        list = patientInfoImportMainMapper.GetPatientInfoImport(patientInfoImport2VO);
-
-         return  list;
-
     }
 
     /**

postdischarge-manage/src/main/resources/mapper/manage/externalImport/ExternalImportMapper.xml

@@ -12,6 +12,7 @@
         <result property="cardNo" column="card_no"/>
         <result property="sex" column="sex"/>
         <result property="departmentName" column="department_name"/>
+        <result property="visitCode" column="visit_code"/>
         <result property="visitMethod" column="visit_method"/>
         <result property="visitDate" column="visit_date"/>
         <result property="admissionTime" column="admission_time"/>
@@ -27,7 +28,7 @@
     </resultMap>
 
     <sql id="selectExternalImportVo">
-        select id, patient_name, phone, age, card_no, sex, department_name, visit_method, visit_date, admission_time, discharge_time, push_time, plan_follow_up, follow_up_template, main_diagnosis, data_source, discharge_method, health_state, data_get_time from external_import
+        select id, patient_name, phone, age, card_no, sex, department_name, visit_code, visit_method, visit_date, admission_time, discharge_time, push_time, plan_follow_up, follow_up_template, main_diagnosis, data_source, discharge_method, health_state, data_get_time from external_import
     </sql>
 
     <select id="selectExternalImportList" parameterType="com.xinelu.manage.domain.externalimport.ExternalImport" resultMap="ExternalImportResult">
@@ -51,6 +52,9 @@
             <if test="departmentName != null  and departmentName != ''">
                 and department_name like concat('%', #{departmentName}, '%')
             </if>
+            <if test="visitCode != null  and visitCode != ''">
+                and visit_code = #{visitCode}
+            </if>
             <if test="visitMethod != null  and visitMethod != ''">
                 and visit_method = #{visitMethod}
             </if>
@@ -112,6 +116,8 @@
             </if>
             <if test="departmentName != null">department_name,
             </if>
+            <if test="visitCode != null">visit_code,
+            </if>
             <if test="visitMethod != null">visit_method,
             </if>
             <if test="visitDate != null">visit_date,
@@ -150,6 +156,8 @@
             </if>
             <if test="departmentName != null">#{departmentName},
             </if>
+            <if test="visitCode != null">#{visitCode},
+            </if>
             <if test="visitMethod != null">#{visitMethod},
             </if>
             <if test="visitDate != null">#{visitDate},
@@ -185,6 +193,7 @@
         card_no,
         sex,
         department_name,
+        visit_code,
         visit_method,
         visit_date,
         admission_time,
@@ -206,6 +215,7 @@
             #{ExternalImport.cardNo},
             #{ExternalImport.sex},
             #{ExternalImport.departmentName},
+            #{ExternalImport.visitCode},
             #{ExternalImport.visitMethod},
             #{ExternalImport.visitDate},
             #{ExternalImport.admissionTime},
@@ -243,6 +253,9 @@
             <if test="departmentName != null">department_name =
                 #{departmentName},
             </if>
+            <if test="visitCode != null">visit_code =
+                #{visitCode},
+            </if>
             <if test="visitMethod != null">visit_method =
                 #{visitMethod},
             </if>

postdischarge-quartz/src/main/java/com/xinelu/quartz/domain/TbFollowUp.java

@@ -12,6 +12,7 @@ public class TbFollowUp {
     private String ZJHM;
     private String JZKSMC;
     private String MZZYBZ;
+    private String JZLSH;
     private String JZSJ;
     private String RYSJ;
     private String CYSJ;

postdischarge-quartz/src/main/java/com/xinelu/quartz/task/MedicalConsortiumPlatformTask.java

@@ -56,6 +56,7 @@ public class MedicalConsortiumPlatformTask {
                 followUp.setZJHM(resultSet.getString("ZJHM"));
                 followUp.setJZKSMC(resultSet.getString("JZKSMC"));
                 followUp.setMZZYBZ(resultSet.getString("MZZYBZ"));
+                followUp.setJZLSH(resultSet.getString("JZLSH"));
                 followUp.setJZSJ(resultSet.getString("JZSJ"));
                 followUp.setRYSJ(resultSet.getString("RYSJ"));
                 followUp.setCYSJ(resultSet.getString("CYSJ"));
@@ -92,6 +93,7 @@ public class MedicalConsortiumPlatformTask {
             externalImport.setAge(tbFollowUp.getNL());
             externalImport.setCardNo(tbFollowUp.getZJHM());
             externalImport.setSex(tbFollowUp.getXB());
+            externalImport.setVisitCode(tbFollowUp.getJZLSH());
             externalImport.setDepartmentName(tbFollowUp.getJZKSMC());
             externalImport.setVisitMethod(tbFollowUp.getMZZYBZ());
             if (Objects.nonNull(tbFollowUp.getJZSJ())) {