Merge branch '0418_小程序开发' of http:///192.168.16.64:3000/zhuangyuanke/PostDischargePatientManage into 0418_小程序开发

postdischarge-manage/src/main/java/com/xinelu/manage/vo/patienttaskexecuterecord/PatientTaskExecuteRecordVO.java

@@ -72,6 +72,10 @@ public class PatientTaskExecuteRecordVO extends PatientTaskExecuteRecord {
     @ApiModelProperty(value = "就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL")
     private String visitMethod;
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "就诊时间（门诊患者）")
+    private LocalDateTime visitDate;
+
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate startDate;
@@ -117,6 +121,4 @@ public class PatientTaskExecuteRecordVO extends PatientTaskExecuteRecord {
 
     @ApiModelProperty(value = "任务处理信息")
     private String routeHandleRemark;
-
-
 }

postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml

@@ -103,6 +103,7 @@
         pter.execute_type,
         pi.patient_type,
         pi.visit_method,
+        pi.visit_date,
         pi.hospital_agency_name,
         pi.campus_agency_name,
         pi.department_name,

postdischarge-manage/src/main/resources/mapper/manage/taskpartitiondict/TaskPartitionDictMapper.xml

@@ -210,13 +210,23 @@
 
     <select id="selectTaskPartitionList"
             resultType="com.xinelu.manage.domain.taskpartitiondict.TaskPartitionDict">
-        select * from task_partition_dict
+        select
+        tpd.id,
+        tpd.task_type_id,
+        tpd.task_type_name,
+        tpd.task_partition_name,
+        tpd.task_partition_code,
+        tpd.second_classify_describe,
+        tpd.execution_time,
+        tpd.task_partition_sort,
+        (SELECT count(1) from label_field_info where task_partition_dict_id = tpd.id) taskPartitionRemark
+        from task_partition_dict tpd
         <where>
             task_type_id in
             <foreach item="ids" collection="list" open="(" separator="," close=")">
                 #{ids}
             </foreach>
         </where>
-        order by task_partition_sort
+        order by tpd.task_partition_sort
     </select>
 </mapper>