Merge remote-tracking branch 'origin/his/chongqingshizhu_dev' into his/chongqingshizhu_dev

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

@@ -197,7 +197,7 @@ public class DataPageDockFacade {
         dataPageDockVO.setSymptom(sourceMap.get("现病史"));
         dataPageDockVO.setVital(sourceMap.get("查体"));
         dataPageDockVO.setDiag(getItem(sourceMap.get("诊断")));
-        dataPageDockVO.setDrug(getDrug(sourceMap.get("药品")));
+        dataPageDockVO.setDrugOrder(getDrug(sourceMap.get("药品")));
         dataPageDockVO.setDiseaseName(getDisease(sourceMap.get("诊断")));
 
         // 查询检查表
@@ -237,12 +237,12 @@ public class DataPageDockFacade {
     }
 
     private List<Pacs> getPacs(List<TranPacsInfo> pacsInfoList) {
-        Pacs pacs = new Pacs();
         List<Pacs> pacsList = new ArrayList<>();
         for (TranPacsInfo pacsInfo : pacsInfoList){
+            Pacs pacs = new Pacs();
             if(StringUtil.isNotBlank(pacsInfo.getPacsName())){
                 pacs.setName(pacsInfo.getPacsName());
-                pacs.setUniqueName(pacsInfo.getPacsName());
+     //           pacs.setUniqueName(pacsInfo.getPacsName());
             }
             if(StringUtil.isNotBlank(pacsInfo.getApplyDate())){
                 pacs.setDateValue(pacsInfo.getApplyDate());

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

@@ -78,7 +78,7 @@ public class PacsVO {
     private String checker;
 
     /**
-     * 操作类型(1：新增，2：删除，3：修改)
+     * 操作类型(0：新增，1：删除，2：修改)
      */
     private Integer type;
 }