重庆石柱bug修复

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

@@ -116,6 +116,8 @@ public class DataPageDockFacade {
             return RespDTO.onError("请输入展示类型,横版：ver，或竖版hor");
         } else if ("".equals(dataPageDockVO.getPlanCode())) {
             return RespDTO.onError("请输入方案编码");
+        } else if ("".equals(dataPageDockVO.getXmlText())) {
+            return RespDTO.onError("请生成XML内容");
         }
         if (StringUtil.isBlank(xmlText)) {
             xmlText = dataPageDockVO.getXmlText();
@@ -165,18 +167,18 @@ public class DataPageDockFacade {
             url = dataPageUrl + "/cdss.html?pushMrId=" + pushMrId + "&mrId=" + mrId + "&hospitalId=" + dataPageDockVO.getHospitalId() + "&planCode=" + dataPageDockVO.getPlanCode();
         }
 
-        try{
-            TranDatadockingLog tranDatadockingLog=new TranDatadockingLog();
+        try {
+            TranDatadockingLog tranDatadockingLog = new TranDatadockingLog();
             tranDatadockingLog.setHospitalId(dataPageDockVO.getHospitalId());
             tranDatadockingLog.setParamIn(JSON.toJSONString(dataPageDockVO));
             tranDatadockingLog.setParamOut(url);
-            tranDatadockingLog.setRemark("页面推送模式，"+dataPageDockVO.getPlanCode());
+            tranDatadockingLog.setRemark("页面推送模式，" + dataPageDockVO.getPlanCode());
 
             tranDatadockingLog.setTransTime(new Date());
 
             dataDockingLogFacade.save(tranDatadockingLog);
-        }catch (Exception e){
-            log.error("页面推送模式，增加日志异常",e.getMessage());
+        } catch (Exception e) {
+            log.error("页面推送模式，增加日志异常", e.getMessage());
         }
 
         return RespDTO.onSuc(url);
@@ -199,14 +201,18 @@ public class DataPageDockFacade {
         dataPageDockVO.setDiag(getItem(sourceMap.get("诊断")));
         dataPageDockVO.setDrugOrder(getDrug(sourceMap.get("药品")));
         dataPageDockVO.setDiseaseName(getDisease(sourceMap.get("诊断")));
+        dataPageDockVO.setOtherAdvice(getItem(sourceMap.get("医嘱")));
 
         // 查询检查表
-        List<TranPacsInfo> pacsInfoList = tranPacsInfoServiceImpl.list(new QueryWrapper<TranPacsInfo>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .in("apply_no", dataPageDockVO.getApplyNo())
-        );
-        dataPageDockVO.setPacsOrder(getPacs(pacsInfoList));
-
+        if (ListUtil.isNotEmpty(dataPageDockVO.getApplyNo())) {
+            List<TranPacsInfo> pacsInfoList = tranPacsInfoServiceImpl.list(new QueryWrapper<TranPacsInfo>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .in("apply_no", dataPageDockVO.getApplyNo())
+            );
+            if (!pacsInfoList.isEmpty()) {
+                dataPageDockVO.setPacsOrder(getPacs(pacsInfoList));
+            }
+        }
     }
 
     private List<Drug> getDrug(String value) {
@@ -238,13 +244,13 @@ public class DataPageDockFacade {
 
     private List<Pacs> getPacs(List<TranPacsInfo> pacsInfoList) {
         List<Pacs> pacsList = new ArrayList<>();
-        for (TranPacsInfo pacsInfo : pacsInfoList){
+        for (TranPacsInfo pacsInfo : pacsInfoList) {
             Pacs pacs = new Pacs();
-            if(StringUtil.isNotBlank(pacsInfo.getPacsName())){
+            if (StringUtil.isNotBlank(pacsInfo.getPacsName())) {
                 pacs.setName(pacsInfo.getPacsName());
-     //           pacs.setUniqueName(pacsInfo.getPacsName());
+                //           pacs.setUniqueName(pacsInfo.getPacsName());
             }
-            if(StringUtil.isNotBlank(pacsInfo.getApplyDate())){
+            if (StringUtil.isNotBlank(pacsInfo.getApplyDate())) {
                 pacs.setDateValue(pacsInfo.getApplyDate());
             }
             pacsList.add(pacs);

src/main/java/com/diagbot/util/XmlUtil.java

@@ -166,17 +166,21 @@ public class XmlUtil {
         if (retMap.containsKey("性别")) {
             retMap.put("性别", retMap.get("性别").substring(retMap.get("性别").length() - 1));
         }
-       //过去史分解
+        //过去史分解
 //        List<String> pastTitles = Lists.newArrayList("既往史", "家族史", "过敏史");
 //        structureMap(pastTitles, "既往史" + retMap.get("过去史"), retMap);
 
         //查体分解
         List<String> vitalTitles = Lists.newArrayList("查体", "诊断", "建议", "科室", "医师签名", "就诊时间", "处置");
-        structureMap(vitalTitles, "查体" + retMap.get("体检").replace("建议 ","建议"), retMap);
+        structureMap(vitalTitles, "查体" + retMap.get("体检").replace("建议 ", "建议"), retMap);
 
         if (retMap.containsKey("建议")) {
-            String drugStr = retMap.get("建议").replace("--------------------- ","");
-            retMap.put("药品", drugStr.substring(0,drugStr.indexOf(" ")));
+            String drugStr = retMap.get("建议").replace("--------------------- ", "");
+            if (drugStr.contains(" ")) {
+                retMap.put("药品", drugStr.substring(0, drugStr.indexOf(" ")));
+            } else {
+                retMap.put("医嘱", drugStr);
+            }
         }
         return retMap;
     }

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

@@ -51,6 +51,7 @@ public class DataPageDockVO extends CdssLogBaseVO{
     /**
      * xml大文本
      */
+    @NotNull(message = "请生成XML内容")
     private String xmlText;
 
     /**