新的医嘱维护

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>13.0.0</version>
+    <version>13.0.2</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>

src/main/java/thyyxxk/webserver/controller/orderZdMaintain/OrderZdMaintainController.java

@@ -10,6 +10,8 @@ import thyyxxk.webserver.entity.orderZdMaintain.dto.AddOrderOccurenceDTO;
 import thyyxxk.webserver.entity.orderZdMaintain.dto.OrderOccurrenceDTO;
 import thyyxxk.webserver.entity.orderZdMaintain.dto.YzOrderItemDTO;
 import thyyxxk.webserver.entity.orderZdMaintain.dto.ZdChargeItemDto;
+import thyyxxk.webserver.entity.orderZdMaintain.dto.frequency.YzOrderFrequencyDTO;
+import thyyxxk.webserver.entity.zhuyuanyisheng.yizhuluru.YzZdOrderItemConfirm;
 import thyyxxk.webserver.service.orderZdMaintain.OrderZdMaintainService;
 import thyyxxk.webserver.utils.ResultVoUtil;
 
@@ -73,4 +75,34 @@ public class OrderZdMaintainController {
         return service.saveOrderOccurence(params);
     }
 
+    @GetMapping("/getAllYzOrderItemConfirm")
+    public ResultVo<List<YzZdOrderItemConfirm>> getAllYzOrderItemConfirm() {
+        return ResultVoUtil.success(dao.getAllYzOrderItemConfirm());
+    }
+
+    @PostMapping("/saveOrderItemConfirm")
+    public ResultVo<String> saveOrderItemConfirm(@RequestBody YzZdOrderItemConfirm param) {
+        try {
+            int i = dao.insertOrderItemConfirm(param);
+            if (i > 0) {
+                return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_EL_NOTIFICATION);
+            }
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "插入失败");
+        } catch (Exception e) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, e.getMessage());
+        }
+    }
+
+
+    @PostMapping("/delOrderItemConfirm")
+    public ResultVo<String> delOrderItemConfirm(@RequestBody YzZdOrderItemConfirm param) {
+        dao.deleteOrderItemConfirm(param);
+        return ResultVoUtil.success();
+    }
+
+    @GetMapping("/selectOrderFrequency")
+    public ResultVo<List<YzOrderFrequencyDTO>> selectOrderFrequency() {
+        return ResultVoUtil.success(dao.selectOrderFrequency());
+    }
+
 }

src/main/java/thyyxxk/webserver/dao/his/LoginDao.java

@@ -35,15 +35,6 @@ public interface LoginDao {
             "where code = #{deptCode} ")
     String getDeptName(@Param("deptCode") String deptCode);
 
-    @Select("select hz_day  from zd_unit_code where code = #{deptCode}")
-    Integer getDeptHzDayByCode(@Param("deptCode") String deptCode);
-
-    @Select("select role_id from dj_user_role where user_code=#{code}")
-    List<Integer> selectUserRoles(String code);
-
-    @Select("select dept_code from zy_part_time_dept where code=#{code}")
-    List<String> selectUserPartTimeDept(String code);
-
     @Select("select distinct code,name from " +
             "(select name=c.name,code=a.dept " +
             "from zd_dept_all a, a_employee_mi b, zd_unit_code c " +

src/main/java/thyyxxk/webserver/dao/his/orderZdMaintain/OrderZdMaintainDao.java

@@ -6,6 +6,8 @@ import thyyxxk.webserver.entity.orderZdMaintain.dto.AddOrderOccurenceDTO;
 import thyyxxk.webserver.entity.orderZdMaintain.dto.OrderOccurrenceDTO;
 import thyyxxk.webserver.entity.orderZdMaintain.dto.YzOrderItemDTO;
 import thyyxxk.webserver.entity.orderZdMaintain.dto.ZdChargeItemDto;
+import thyyxxk.webserver.entity.orderZdMaintain.dto.frequency.YzOrderFrequencyDTO;
+import thyyxxk.webserver.entity.zhuyuanyisheng.yizhuluru.YzZdOrderItemConfirm;
 
 import java.util.List;
 
@@ -16,7 +18,6 @@ public interface OrderZdMaintainDao {
             "FROM zd_charge_item_type")
     List<CodeName> getChangeItemType();
 
-
     @Select("SELECT order_class,\n" +
             "       yz_order_item.order_code,\n" +
             "       order_class_name = (select name from zd_charge_item_type where code = order_class),\n" +
@@ -61,7 +62,6 @@ public interface OrderZdMaintainDao {
             "    a.occ_code=b.code")
     List<OrderOccurrenceDTO> getChangeItem(String orderCode);
 
-
     @Select("SELECT zd_charge_item.code,\n" +
             "       zd_charge_item.exec_unit,\n" +
             "       zd_charge_item.name,\n" +
@@ -134,5 +134,84 @@ public interface OrderZdMaintainDao {
             "VALUES ( #{params.occCode}, #{params.orderCode}, #{params.amount} )\n")
     void insertOcc(@Param("params") AddOrderOccurenceDTO.OrderItem params);
 
+    @Select("select * from yz_zd_order_item_confirm")
+    List<YzZdOrderItemConfirm> getAllYzOrderItemConfirm();
+
+
+    @Insert("insert into yz_zd_order_item_confirm(item_name, order_code, count) values (#{param.itemName},#{param.orderCode},#{param.count})")
+    int insertOrderItemConfirm(@Param("param") YzZdOrderItemConfirm param);
+
+
+    @Delete("delete  yz_zd_order_item_confirm where order_code = #{param.orderCode} and item_name = #{param.itemName}")
+    void deleteOrderItemConfirm(@Param("param") YzZdOrderItemConfirm param);
+
+    @Select("SELECT rtrim(code) as code,\n" +
+            "       rtrim(comm) as comm,\n" +
+            "       week_day,\n" +
+            "       day_600,\n" +
+            "       day_630,\n" +
+            "       day_700,\n" +
+            "       day_730,\n" +
+            "       day_800,\n" +
+            "       day_830,\n" +
+            "       day_900,\n" +
+            "       day_930,\n" +
+            "       day_1000,\n" +
+            "       day_1030,\n" +
+            "       day_1100,\n" +
+            "       day_1130,\n" +
+            "       day_1200,\n" +
+            "       day_1230,\n" +
+            "       day_1300,\n" +
+            "       day_1330,\n" +
+            "       day_1400,\n" +
+            "       day_1430,\n" +
+            "       day_1500,\n" +
+            "       day_1530,\n" +
+            "       day_1600,\n" +
+            "       day_1630,\n" +
+            "       day_1700,\n" +
+            "       day_1730,\n" +
+            "       day_1800,\n" +
+            "       day_1830,\n" +
+            "       day_1900,\n" +
+            "       day_1930,\n" +
+            "       day_2000,\n" +
+            "       day_2030,\n" +
+            "       day_2100,\n" +
+            "       day_2130,\n" +
+            "       day_2200,\n" +
+            "       day_2230,\n" +
+            "       day_2300,\n" +
+            "       day_2330,\n" +
+            "       day_2400,\n" +
+            "       day_030,\n" +
+            "       day_100,\n" +
+            "       day_130,\n" +
+            "       day_200,\n" +
+            "       day_230,\n" +
+            "       day_300,\n" +
+            "       day_330,\n" +
+            "       day_400,\n" +
+            "       day_430,\n" +
+            "       day_500,\n" +
+            "       day_530,\n" +
+            "       week_1,\n" +
+            "       week_2,\n" +
+            "       week_3,\n" +
+            "       week_4,\n" +
+            "       week_5,\n" +
+            "       week_6,\n" +
+            "       week_7,\n" +
+            "       donot_modify,\n" +
+            "       rtrim(print_name) as print_name,\n" +
+            "       sort_code,\n" +
+            "       special_flag,\n" +
+            "       del_flag,\n" +
+            "       new_flag='0',\n" +
+            "       self_buy,\n" +
+            "       use_time\n" +
+            "FROM yz_order_frequency")
+    List<YzOrderFrequencyDTO> selectOrderFrequency();
 
 }

src/main/java/thyyxxk/webserver/entity/orderZdMaintain/dto/frequency/YzOrderFrequencyDTO.java

@@ -0,0 +1,429 @@
+package thyyxxk.webserver.entity.orderZdMaintain.dto.frequency;
+
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.NoArgsConstructor;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "yz_order_frequency")
+public class YzOrderFrequencyDTO implements Serializable {
+
+    private static final long serialVersionUID = 28190839933159332L;
+
+    /**
+     * code
+     */
+    @TableField(value = "code")
+    private String code;
+
+    /**
+     * week1
+     */
+    @TableField(value = "week_1")
+    private Integer week1;
+
+    /**
+     * week2
+     */
+    @TableField(value = "week_2")
+    private Integer week2;
+
+    /**
+     * week3
+     */
+    @TableField(value = "week_3")
+    private Integer week3;
+
+    /**
+     * week4
+     */
+    @TableField(value = "week_4")
+    private Integer week4;
+
+    /**
+     * week5
+     */
+    @TableField(value = "week_5")
+    private Integer week5;
+
+    /**
+     * week6
+     */
+    @TableField(value = "week_6")
+    private Integer week6;
+
+    /**
+     * week7
+     */
+    @TableField(value = "week_7")
+    private Integer week7;
+
+    /**
+     * day800
+     */
+    @TableField(value = "day_800")
+    private Integer day800;
+
+    /**
+     * day830
+     */
+    @TableField(value = "day_830")
+    private Integer day830;
+
+    /**
+     * day900
+     */
+    @TableField(value = "day_900")
+    private Integer day900;
+
+    /**
+     * day930
+     */
+    @TableField(value = "day_930")
+    private Integer day930;
+
+    /**
+     * day1000
+     */
+    @TableField(value = "day_1000")
+    private Integer day1000;
+
+    /**
+     * day1030
+     */
+    @TableField(value = "day_1030")
+    private Integer day1030;
+
+    /**
+     * day1100
+     */
+    @TableField(value = "day_1100")
+    private Integer day1100;
+
+    /**
+     * day1130
+     */
+    @TableField(value = "day_1130")
+    private Integer day1130;
+
+    /**
+     * day1200
+     */
+    @TableField(value = "day_1200")
+    private Integer day1200;
+
+    /**
+     * day1230
+     */
+    @TableField(value = "day_1230")
+    private Integer day1230;
+
+    /**
+     * day1300
+     */
+    @TableField(value = "day_1300")
+    private Integer day1300;
+
+    /**
+     * day1330
+     */
+    @TableField(value = "day_1330")
+    private Integer day1330;
+
+    /**
+     * day1400
+     */
+    @TableField(value = "day_1400")
+    private Integer day1400;
+
+    /**
+     * day1430
+     */
+    @TableField(value = "day_1430")
+    private Integer day1430;
+
+    /**
+     * day1500
+     */
+    @TableField(value = "day_1500")
+    private Integer day1500;
+
+    /**
+     * day1530
+     */
+    @TableField(value = "day_1530")
+    private Integer day1530;
+
+    /**
+     * day1600
+     */
+    @TableField(value = "day_1600")
+    private Integer day1600;
+
+    /**
+     * day1630
+     */
+    @TableField(value = "day_1630")
+    private Integer day1630;
+
+    /**
+     * day1700
+     */
+    @TableField(value = "day_1700")
+    private Integer day1700;
+
+    /**
+     * day1730
+     */
+    @TableField(value = "day_1730")
+    private Integer day1730;
+
+    /**
+     * day1800
+     */
+    @TableField(value = "day_1800")
+    private Integer day1800;
+
+    /**
+     * day1830
+     */
+    @TableField(value = "day_1830")
+    private Integer day1830;
+
+    /**
+     * day1900
+     */
+    @TableField(value = "day_1900")
+    private Integer day1900;
+
+    /**
+     * day1930
+     */
+    @TableField(value = "day_1930")
+    private Integer day1930;
+
+    /**
+     * day2000
+     */
+    @TableField(value = "day_2000")
+    private Integer day2000;
+
+    /**
+     * day2030
+     */
+    @TableField(value = "day_2030")
+    private Integer day2030;
+
+    /**
+     * day2100
+     */
+    @TableField(value = "day_2100")
+    private Integer day2100;
+
+    /**
+     * day2130
+     */
+    @TableField(value = "day_2130")
+    private Integer day2130;
+
+    /**
+     * day2200
+     */
+    @TableField(value = "day_2200")
+    private Integer day2200;
+
+    /**
+     * day2230
+     */
+    @TableField(value = "day_2230")
+    private Integer day2230;
+
+    /**
+     * day2300
+     */
+    @TableField(value = "day_2300")
+    private Integer day2300;
+
+    /**
+     * day2330
+     */
+    @TableField(value = "day_2330")
+    private Integer day2330;
+
+    /**
+     * day2400
+     */
+    @TableField(value = "day_2400")
+    private Integer day2400;
+
+    /**
+     * day030
+     */
+    @TableField(value = "day_030")
+    private Integer day030;
+
+    /**
+     * day100
+     */
+    @TableField(value = "day_100")
+    private Integer day100;
+
+    /**
+     * day130
+     */
+    @TableField(value = "day_130")
+    private Integer day130;
+
+    /**
+     * day200
+     */
+    @TableField(value = "day_200")
+    private Integer day200;
+
+    /**
+     * day230
+     */
+    @TableField(value = "day_230")
+    private Integer day230;
+
+    /**
+     * day300
+     */
+    @TableField(value = "day_300")
+    private Integer day300;
+
+    /**
+     * day330
+     */
+    @TableField(value = "day_330")
+    private Integer day330;
+
+    /**
+     * day400
+     */
+    @TableField(value = "day_400")
+    private Integer day400;
+
+    /**
+     * day430
+     */
+    @TableField(value = "day_430")
+    private Integer day430;
+
+    /**
+     * day500
+     */
+    @TableField(value = "day_500")
+    private Integer day500;
+
+    /**
+     * day530
+     */
+    @TableField(value = "day_530")
+    private Integer day530;
+
+    /**
+     * day600
+     */
+    @TableField(value = "day_600")
+    private Integer day600;
+
+    /**
+     * day630
+     */
+    @TableField(value = "day_630")
+    private Integer day630;
+
+    /**
+     * day700
+     */
+    @TableField(value = "day_700")
+    private Integer day700;
+
+    /**
+     * day730
+     */
+    @TableField(value = "day_730")
+    private Integer day730;
+
+    /**
+     * weekDay
+     */
+    @TableField(value = "week_day")
+    private String weekDay;
+
+    /**
+     * comm
+     */
+    @TableField(value = "comm")
+    private String comm;
+
+    /**
+     * donotModify
+     */
+    @TableField(value = "donot_modify")
+    private String donotModify;
+
+    /**
+     * delFlag
+     */
+    @TableField(value = "del_flag")
+    private String delFlag;
+
+    /**
+     * printName
+     */
+    @TableField(value = "print_name")
+    private String printName;
+
+    /**
+     * sortCode
+     */
+    @TableField(value = "sort_code")
+    private String sortCode;
+
+    /**
+     * times
+     */
+    @TableField(value = "times")
+    private Integer times;
+
+    /**
+     * specialFlag
+     */
+    @TableField(value = "special_flag")
+    private String specialFlag;
+
+    /**
+     * selfBuy
+     */
+    @TableField(value = "self_buy")
+    private String selfBuy;
+
+    /**
+     * useTime
+     */
+    @TableField(value = "use_time")
+    private String useTime;
+
+    public static LambdaQueryWrapper<YzOrderFrequencyDTO> lambdaQueryWrapper() {
+        return new LambdaQueryWrapper<>();
+    }
+
+    public static QueryWrapper<YzOrderFrequencyDTO> queryWrapper() {
+        return new QueryWrapper<>();
+    }
+
+
+}