Merge branch 'develop' into dev/20200603_1.2.2

# Conflicts:
#	src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

doc/005.20200528v1.2.x/qc_init.sql

@@ -1048,4 +1048,9 @@ CREATE TABLE `med_module_mapping` (
 ) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8 COMMENT='模板与文书映射关系表';
 
 
-ALTER TABLE `med_behospital_info` ADD INDEX `idx_hospital_id_behospital_code` (`hospital_id`,`behospital_code`) USING BTREE;
+ALTER TABLE `med_behospital_info` ADD INDEX `idx_hospital_id_behospital_code` (`hospital_id`,`behospital_code`) USING BTREE;
+
+alter table med_medical_record add COLUMN `status` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '模板处理状态(0:未处理，1：已处理)' AFTER `rec_title`;
+
+alter table med_home_diagnose_info MODIFY COLUMN `diagnose_order_no` INT(11) NOT NULL COMMENT '诊断序号';
+alter table med_home_operation_info MODIFY COLUMN `operation_order_no` INT(11) NOT NULL COMMENT '手术序号';

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -64,6 +64,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/behospitalInfo/exportExcel").permitAll()
                 .antMatchers("/qc/behospitalInfo/exportQcresult").permitAll()
                 .antMatchers("/qc/behospitalInfo/exportQcresultByDept").permitAll()
+                .antMatchers("/qc/abnormal/getQcAnnormalMode").permitAll()
                 .antMatchers("/**").authenticated();
 //                .antMatchers("/**").permitAll();
     }

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -107,6 +107,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/behospitalInfo/exportExcel", request)
                 || matchers("/qc/behospitalInfo/exportQcresult", request)
                 || matchers("/qc/behospitalInfo/exportQcresultByDept", request)
+                || matchers("/qc/abnormal/getQcAnnormalMode", request)
                 || matchers("/", request)) {
             return true;
         }

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -28,7 +28,6 @@ import com.diagbot.entity.HomeDiagnoseInfo;
 import com.diagbot.entity.HomeOperationInfo;
 import com.diagbot.entity.HomePage;
 import com.diagbot.entity.MedicalRecord;
-import com.diagbot.entity.SysUserDept;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -49,7 +48,6 @@ import com.diagbot.vo.AnalyzeRunVO;
 import com.diagbot.vo.AnalyzeVO;
 import com.diagbot.vo.BehospitalPageVO;
 import com.diagbot.vo.ExportQcresultVO;
-import com.diagbot.vo.FilterVO;
 import com.diagbot.vo.GetDetailVO;
 import com.diagbot.vo.MedrecVo;
 import com.diagbot.vo.QcResultAlgQueryVO;
@@ -256,6 +254,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .eq("hospital_id", hospitalId)
                     .eq("home_page_id", homePage.getHomePageId())
+                    .orderByAsc("diagnose_order_no")
             );
 
             // 获取首页手术信息
@@ -263,6 +262,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .eq("hospital_id", hospitalId)
                     .eq("home_page_id", homePage.getHomePageId())
+                    .orderByAsc("operation_order_no")
             );
         }
 
@@ -606,7 +606,11 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 if (map.containsKey(objKey)) {
                     if (firstPageDate.contains(objKey)) {
                         Date date = (Date) objectMap.get(objKey);
-                        content.put(map.get(objKey), DateUtil.formatDateTime(date).replaceAll("null", ""));
+                        if ("birthday".equals(objKey)) {
+                            content.put(map.get(objKey), DateUtil.formatDate(date));
+                        } else {
+                            content.put(map.get(objKey), DateUtil.formatDateTime(date));
+                        }
                     } else {
                         content.put(map.get(objKey), String.valueOf(objectMap.get(objKey)).replaceAll("null", ""));
                     }

src/main/java/com/diagbot/facade/QcAbnormalFacade.java

@@ -92,15 +92,24 @@ public class QcAbnormalFacade extends QcAbnormalServiceImpl {
      * @return 是否成功
      */
     public Boolean saveQcAnnormalNameAll(QcAbnormalSaveNameVO qcAbnormalSaveNameVO) {
-        return this.update(new UpdateWrapper<QcAbnormal>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", SysUserUtils.getCurrentHospitalID())
-                .eq("description", qcAbnormalSaveNameVO.getDescription())
-                .set("status", qcAbnormalSaveNameVO.getStatus())
-                .set("remark", qcAbnormalSaveNameVO.getRemark())
-                .set("gmt_modified", DateUtil.now())
-                .set("modifier", SysUserUtils.getCurrentPrincipleID())
-        );
+
+        boolean res = false;
+            res = this.update(new UpdateWrapper<QcAbnormal>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("hospital_id", SysUserUtils.getCurrentHospitalID())
+                    .eq("type", 1)//异常类型(1:数据模块 2：质控类型 3：XML结构)
+                    .eq("description", qcAbnormalSaveNameVO.getDescription())
+                    .set("status", qcAbnormalSaveNameVO.getStatus())
+                    .set("gmt_modified", DateUtil.now())
+                    .set("modifier", SysUserUtils.getCurrentPrincipleID())
+            );
+            //最后更新备注
+            res = this.update(new UpdateWrapper<QcAbnormal>()
+                    .eq("id", qcAbnormalSaveNameVO.getId())
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .set("remark", qcAbnormalSaveNameVO.getRemark())
+            );
+        return res;
     }
 
 

src/main/java/com/diagbot/vo/QcAbnormalSaveNameVO.java

@@ -14,6 +14,8 @@ import javax.validation.constraints.NotNull;
 @Setter
 @Getter
 public class QcAbnormalSaveNameVO {
+    @NotNull(message = "请输入Id")
+    private  Long id;
     @NotBlank(message = "请输入异常描述")
     private  String description;
     @NotNull(message = "请输入处理状态")

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -376,7 +376,6 @@
         WHERE
         a.is_deleted = 'N'
         AND a.is_placefile = '1'
-        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>
@@ -486,7 +485,6 @@
         AND a.hospital_id = c.hospital_id
         AND a.beh_dept_id = c.dept_id
         AND a.is_placefile = '1'
-        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="userId!=null">
             AND c.user_id = #{userId}
         </if>

src/main/resources/mapper/QcCasesEntryMapper.xml

@@ -121,7 +121,6 @@
         AND t2.is_deleted = 'N'
         AND t3.is_deleted = 'N'
         AND t1.id = t2.cases_entry_id
-        AND t2.is_used = 1
         AND t1.mode_id = t3.id
         AND t2.hospital_id = #{hospitalId}
         ORDER BY t3.order_no,t1.order_no