Преглед изворни кода

Merge branch 'dev/20200716_1.3.8' into debug

wangfeng пре 4 година
родитељ
комит
8e2b3890e0

+ 4 - 0
doc/017.20200716v1.3.8/qc_inti_check.sql

@@ -0,0 +1,4 @@
+use `qc`;
+ALTER TABLE `med_check_info` ADD COLUMN `check_type` INT(11) NULL COMMENT '核查类型(0病历,1病案首页)' AFTER `status`;
+UPDATE med_check_info a SET check_type =0;
+UPDATE med_check_info a SET check_name = (SELECT linkman FROM sys_user b WHERE a.check_id=b.id) inkman FROM sys_user b WHERE a.check_id=b.id)

+ 2 - 4
src/main/java/com/diagbot/dto/BehospitalInfoDTO.java

@@ -122,8 +122,6 @@ public class BehospitalInfoDTO implements Serializable {
     private Integer mrStatus;
     private String chName;
     private String mrName;
-    private Date chTimeStart;
-    private Date chTimeEnd;
-    private Date mrTimeStart;
-    private Date mrTimeEnd;
+    private Date chTime;
+    private Date mrTime;
 }