Merge remote-tracking branch 'origin/dev/20220309_v2.2.1通用版_病历详情其他文书信息' into develop

doc/044.20220311v2.2.1/qc_initv2.2.1.sql

@@ -0,0 +1,8 @@
+use `qc`;
+
+UPDATE `qc_mode` SET `name`='其他信息' WHERE (`name`='其他');
+
+
+
+
+

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

@@ -2431,6 +2431,8 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         pageMap.put("检验信息", null);
         // 护理信息
         pageMap.put("护理信息", null);
+        // 其他信息
+        pageMap.put("其他信息", null);
         // 知情同意书 = 【知情同意书】 + 【手术知情同意书】
         pageMap.put("知情同意书", recordDTOList);
         pageMap.put("谈话告知书", recordMap.get(54L));

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

@@ -2,9 +2,9 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.*;
-import com.diagbot.entity.MedNurse;
 import com.diagbot.entity.MedicalRecord;
 import com.diagbot.entity.MedicalRecordContent;
 import com.diagbot.enums.IsDeleteEnum;
@@ -14,16 +14,16 @@ import com.diagbot.facade.data.AMedicalRecordContentFacade;
 import com.diagbot.service.impl.MedicalRecordServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.EncrypDES;
+import com.diagbot.util.StringUtil;
 import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.MedRecordContentOtherVO;
 import com.diagbot.vo.MedRecordOtherVO;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @Description:
  * @author: Wsy
@@ -46,6 +46,7 @@ public class MedicalRecordOtherFacade extends MedicalRecordServiceImpl {
      * @return
      */
     public IPage<MedicalRecord> pageFac(MedRecordOtherVO medRecordOtherVO) {
+        Boolean flag = false;
         QueryWrapper<MedicalRecord> medicalRecordQueryWrapper = new QueryWrapper<>();
         medicalRecordQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         medicalRecordQueryWrapper.eq("hospital_id", Long.valueOf(SysUserUtils.getCurrentHospitalID()));
@@ -63,7 +64,19 @@ public class MedicalRecordOtherFacade extends MedicalRecordServiceImpl {
         if (medRecordOtherVO.getRecDateEnd() != null && medRecordOtherVO != null) {
             medicalRecordQueryWrapper.le("rec_date", medRecordOtherVO.getRecDateEnd());
         }
-        medicalRecordQueryWrapper.orderByDesc("rec_date");
+        for (Object order : medRecordOtherVO.getOrders()) {
+            ObjectMapper objectMapper = new ObjectMapper();
+            OrderItem orderName = objectMapper.convertValue(order, OrderItem.class);
+            String column = orderName.getColumn();
+            if (StringUtil.isNotEmpty(column) && orderName.isAsc()) {
+                flag = true;
+            }
+        }
+        if (flag) {
+            medicalRecordQueryWrapper.orderByAsc("rec_date");
+        } else {
+            medicalRecordQueryWrapper.orderByDesc("rec_date");
+        }
 
         Page<MedicalRecord> pageCase = new Page<MedicalRecord>(medRecordOtherVO.getCurrent(), medRecordOtherVO.getSize());
         IPage<MedicalRecord> medicalRecordIPage = medicalRecordFacade.getBaseMapper().selectPage(pageCase, medicalRecordQueryWrapper);
@@ -80,8 +93,12 @@ public class MedicalRecordOtherFacade extends MedicalRecordServiceImpl {
                 .eq("rec_id", medRecordContentOtherVO.getRecId())
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
         );
-        if (medicalRecordContent != null && medicalRecordContent.getHospitalId() == 35) {
-            medicalRecordContent.setHtmlText(medicalRecordContent.getXmlText());
+        if (medicalRecordContent != null) {
+            if (medicalRecordContent.getHospitalId() == 35) {
+                medicalRecordContent.setHtmlText(medicalRecordContent.getXmlText());
+            }
+        } else {
+            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "该文书数据缺失~");
         }
         MedRecordContentOtherDTO medRecordContentOtherDTO = new MedRecordContentOtherDTO();
         BeanUtil.copyProperties(medicalRecordContent, medRecordContentOtherDTO);