优化住院医生

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

@@ -6,6 +6,7 @@ import org.springframework.web.bind.annotation.*;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.datamodify.GetDropdownBox;
 import thyyxxk.webserver.entity.datamodify.YzActOrder;
+import thyyxxk.webserver.entity.inpatient.patient.Patient;
 import thyyxxk.webserver.entity.zhuyuanyisheng.yizhuluru.*;
 import thyyxxk.webserver.service.zhuyuanyisheng.YiZhuLuRuServer;
 
@@ -31,6 +32,12 @@ public class YizhuLuRuController {
     }
 
 
+    @GetMapping("/getMyPatient")
+    public ResultVo<List<Patient>> getMyPatient() {
+        return server.getMyPatient();
+    }
+
+
     @GetMapping("/huoQuYiZhuMingCheng")
     public ResultVo<List<GetDropdownBox>> huoQuYiZhuMingCheng(@RequestParam("inpatientNo") String inpatientNo,
                                                               @RequestParam("admissTimes") Integer admissTimes,

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/YiZhuLuRuDao.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.*;
 import thyyxxk.webserver.entity.datamodify.GetDropdownBox;
 import thyyxxk.webserver.entity.datamodify.YzActOrder;
+import thyyxxk.webserver.entity.inpatient.patient.Patient;
 import thyyxxk.webserver.entity.zhuyuanyisheng.DoctorSOrderFee;
 import thyyxxk.webserver.entity.zhuyuanyisheng.ZyOrderZk;
 import thyyxxk.webserver.entity.zhuyuanyisheng.yizhuluru.*;
@@ -25,6 +26,13 @@ import java.util.Set;
 @Mapper
 public interface YiZhuLuRuDao {
 
+
+    @Select("SELECT inpatient_no, admiss_times, sex, name, bed_no " +
+            "FROM zy_actpatient\n" +
+            "where refer_physician = #{code}")
+    List<Patient> getMyPatient(String code);
+
+
     @Select("select isnull(balance,0) balance, " +
             "       total_charge, " +
             "       charge1, " +

src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/yizhuluru/YiZhuFeiYongChaXunTiaoJian.java

@@ -42,15 +42,15 @@ public class YiZhuFeiYongChaXunTiaoJian {
 
     /**
      * 医嘱状态
-     *   {code: 0, name: '全部'},
-     *   {code: 1, name: '录入'},
-     *   {code: 2, name: '确认'},
-     *   {code: 3, name: '执行'},
-     *   {code: 5, name: '停止'},
-     *   {code: 6, name: '可停止'},
-     *   {code: 7, name: '可撤销'},
-     *   {code: 8, name: '临时医嘱'},
-     *   {code: 9, name: '长期医嘱'},
+     * {code: 0, name: '全部'},
+     * {code: 1, name: '录入'},
+     * {code: 2, name: '确认'},
+     * {code: 3, name: '执行'},
+     * {code: 5, name: '停止'},
+     * {code: 6, name: '可停止'},
+     * {code: 7, name: '可撤销'},
+     * {code: 8, name: '临时医嘱'},
+     * {code: 9, name: '长期医嘱'},
      */
     private Integer zhuangTai;
 
@@ -58,4 +58,12 @@ public class YiZhuFeiYongChaXunTiaoJian {
      * 医嘱号
      */
     private String actOrderNo;
+
+    /**
+     * 0 全部
+     * 1 停止
+     * 2 当前
+     * 3 当日
+     */
+    private String displayRange;
 }

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

@@ -17,6 +17,7 @@ import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.RoleCode;
 import thyyxxk.webserver.entity.datamodify.GetDropdownBox;
 import thyyxxk.webserver.entity.datamodify.YzActOrder;
+import thyyxxk.webserver.entity.inpatient.patient.Patient;
 import thyyxxk.webserver.entity.login.UserInfo;
 import thyyxxk.webserver.entity.zhuyuanyisheng.DoctorSOrderFee;
 import thyyxxk.webserver.entity.zhuyuanyisheng.ZyOrderZk;
@@ -64,6 +65,9 @@ public class YiZhuLuRuServer {
         this.redisLikeService = redisLikeService;
     }
 
+    public ResultVo<List<Patient>> getMyPatient() {
+        return ResultVoUtil.success(dao.getMyPatient(TokenUtil.getTokenUserId()));
+    }
 
     /**
      * 获取医嘱的名称 这里为什么不用 医嘱的code和医嘱号呢，是因为药品编码和项目编码有些一样而医嘱号，又每次只能查询一个
@@ -1119,18 +1123,14 @@ public class YiZhuLuRuServer {
         if (ListUtil.isBlank(param)) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有可以退的药品。");
         }
-
         List<List<String>> list = ListUtils.partition(param, 40);
         List<YzActOrder> yzActOrders = new ArrayList<>();
         for (List<String> strings : list) {
             yzActOrders.addAll(dao.getOriginalOrderData(strings));
         }
-
         List<List<YzActOrder>> returnedDoctorSOrder = ListUtils.partition(yzActOrders, 20);
         String userCode = TokenUtil.getTokenUserId();
-
         Map<String, String> fatherAndSonDoctorSAdvice = new HashMap<>();
-
         for (YzActOrder item : yzActOrders) {
             BigDecimal orderNo = BigDecimal.valueOf(publicServer.getActOrderNo());
             BigDecimal oldOrderNo = item.getActOrderNo();
@@ -1140,11 +1140,9 @@ public class YiZhuLuRuServer {
             }
             item.setActOrderNo(orderNo);
         }
-
         for (List<YzActOrder> orders : returnedDoctorSOrder) {
             dao.insertAReturnOrder(userCode, orders);
         }
-
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "退药成功。");
     }