xiaochan преди 3 години
родител
ревизия
c290bf023e

+ 2 - 2
src/main/java/thyyxxk/webserver/controller/jiekou/DuiWaiJieKouController.java

@@ -11,8 +11,8 @@ import thyyxxk.webserver.config.auth.PassToken;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.datamodify.MzChargeDetail;
+import thyyxxk.webserver.entity.jiekou.GetPatientInformationParam;
 import thyyxxk.webserver.entity.jiekou.PatientInformation;
-import thyyxxk.webserver.entity.jiekou.getPatientInformationParam;
 import thyyxxk.webserver.entity.login.UserInfo;
 import thyyxxk.webserver.service.PublicServer;
 import thyyxxk.webserver.service.jiekou.DuiWaiJieKouService;
@@ -50,7 +50,7 @@ public class DuiWaiJieKouController {
 
     @PassToken
     @PostMapping("/getPatientInformation")
-    public ResultVo<List<PatientInformation>> getPatientInformation(@RequestBody getPatientInformationParam param) {
+    public ResultVo<List<PatientInformation>> getPatientInformation(@RequestBody GetPatientInformationParam param) {
         return service.getPatientInformation(param);
     }
 

+ 1 - 1
src/main/java/thyyxxk/webserver/entity/jiekou/GetPatientInformationParam.java

@@ -11,7 +11,7 @@ import lombok.Data;
  * @date 2021-07-13 08:12
  */
 @Data
-public class getPatientInformationParam {
+public class GetPatientInformationParam {
     private String source;
     private Integer flag;
     private String patient;

+ 2 - 2
src/main/java/thyyxxk/webserver/service/jiekou/DuiWaiJieKouService.java

@@ -5,8 +5,8 @@ import org.springframework.stereotype.Service;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.dao.his.jiekou.DuiWaiJieKouDao;
 import thyyxxk.webserver.entity.ResultVo;
+import thyyxxk.webserver.entity.jiekou.GetPatientInformationParam;
 import thyyxxk.webserver.entity.jiekou.PatientInformation;
-import thyyxxk.webserver.entity.jiekou.getPatientInformationParam;
 import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.StringUtil;
 
@@ -31,7 +31,7 @@ public class DuiWaiJieKouService {
         this.dao = dao;
     }
 
-    public ResultVo<List<PatientInformation>> getPatientInformation(getPatientInformationParam param) {
+    public ResultVo<List<PatientInformation>> getPatientInformation(GetPatientInformationParam param) {
         log.info("查询:{}", param);
         if (StringUtil.notBlank(param.getSource()) && param.getSource().equals("SZBY")) {
             List<PatientInformation> list = new ArrayList<>();

+ 1 - 2
src/main/java/thyyxxk/webserver/service/zhuyuanyiji/QueRenYiZhuShouFeiServer.java

@@ -52,12 +52,11 @@ public class QueRenYiZhuShouFeiServer {
      */
     public ResultVo<IPage<YzActOrder>> getXuQueFeiYiZhu(YzActOrder yzActOrder) {
         IPage<YzActOrder> page = new Page<>(yzActOrder.getCurrentPage(), yzActOrder.getPageSize(), false);
-
         List<String> execUnitList = publicServer.getKeShiLieBiaoList(yzActOrder.getExecUnit());
         if (StringUtil.isBlank(yzActOrder.getExecUnit())) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "科室信息为空 [・_・?]");
         }
-
+        // 查看历史 等于 3 就是查看 没有被确认的 不等于 3 就是查看历史
         String liShi = "=";
 
         if (yzActOrder.getLiShi() == 1) {