完成查看全院查看电子病历

src/main/java/thyyxxk/webserver/controller/zhuyuanyizheng/EmrController.java

@@ -5,6 +5,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import thyyxxk.webserver.config.auth.PassToken;
 import thyyxxk.webserver.entity.ResultVo;
+import thyyxxk.webserver.entity.dictionary.CodeName;
 import thyyxxk.webserver.entity.zhuyuanyisheng.emr.EmrPatientData;
 import thyyxxk.webserver.service.zhuyuanyisheng.EmrServer;
 
@@ -85,4 +86,10 @@ public class EmrController {
         return server.getExtractDataElement(patNo, times);
     }
 
+    @GetMapping("/getAllWards")
+    public ResultVo<List<CodeName>> getAllWards() {
+        return server.getAllWards();
+    }
+
+
 }

src/main/java/thyyxxk/webserver/entity/dictionary/CodeName.java

@@ -23,4 +23,13 @@ public class CodeName {
         this.code = code;
         this.name = name;
     }
+
+    public String getValue() {
+        return code;
+    }
+
+    public String getLabel() {
+        return name;
+    }
+
 }

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/CaoYaoYiZhuServer.java

@@ -126,7 +126,6 @@ public class CaoYaoYiZhuServer {
 
     public ResultVo<String> cunMuBan(YzOrderPatternCy param) {
         log.info("插入模板草药模板：{}", JSON.toJSONString(param));
-
         dao.chaRuMuBan(param.getList(), param.getPatternName(), TokenUtil.getTokenUserId(),
                 PingYinUtils.pyShouZiMuDaXie(param.getPatternName()).substring(0, 8), PingYinUtils.getWBCode(param.getPatternName()).substring(0, 8),
                 param.getDeptCode());
@@ -145,6 +144,7 @@ public class CaoYaoYiZhuServer {
         }
         param.setOrderJe(sum);
         param.setInputId(TokenUtil.getTokenUserId());
+        // 设置代煎费
         param.setOrderJeDj(dao.huoQuDaiJianFei());
         param.setPageNo(publicServer.getTheDrugListNo());
         XinZhenYiZhu huanZheXinXi = yiZhuLuRuDao.huoQuHuanZheXinXi(param.getInpatientNo(), param.getAdmissTimes());

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/EmrServer.java

@@ -10,17 +10,16 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.constants.EmrType;
+import thyyxxk.webserver.dao.his.LoginDao;
 import thyyxxk.webserver.dao.his.zhuyuanyisheng.EmrPatientDao;
 import thyyxxk.webserver.entity.ResultVo;
+import thyyxxk.webserver.entity.dictionary.CodeName;
 import thyyxxk.webserver.entity.drg.AuxiliaryFillingOfDiagnosis;
-import thyyxxk.webserver.entity.inpatient.patient.Patient;
 import thyyxxk.webserver.entity.zhuyuanyisheng.emr.EmrDataElement;
 import thyyxxk.webserver.entity.zhuyuanyisheng.emr.EmrDataExtract;
 import thyyxxk.webserver.entity.zhuyuanyisheng.emr.EmrPatientData;
 import thyyxxk.webserver.service.PublicServer;
 import thyyxxk.webserver.service.externalhttp.emr.EmrEditor;
-import thyyxxk.webserver.service.inpatient.PatientService;
-import thyyxxk.webserver.service.redislike.RedisLikeService;
 import thyyxxk.webserver.utils.*;
 
 import java.util.*;
@@ -35,15 +34,13 @@ public class EmrServer {
     private final EmrPatientDao dao;
     private final EmrEditor emr;
     private final PublicServer publicServer;
-    private final PatientService patientService;
-    private final RedisLikeService realtimeService;
+    private final LoginDao loginDao;
 
-    public EmrServer(EmrPatientDao dao, EmrEditor emr, PublicServer publicServer, PatientService patientService, RedisLikeService realtimeService) {
+    public EmrServer(EmrPatientDao dao, EmrEditor emr, PublicServer publicServer, LoginDao loginDao) {
         this.dao = dao;
         this.emr = emr;
         this.publicServer = publicServer;
-        this.patientService = patientService;
-        this.realtimeService = realtimeService;
+        this.loginDao = loginDao;
     }
 
     /**
@@ -369,5 +366,8 @@ public class EmrServer {
         }
     }
 
+    public ResultVo<List<CodeName>> getAllWards() {
+        return ResultVoUtil.success(loginDao.getAllWards());
+    }
 
 }