门诊挂号打印发票增加就诊序号

src/main/java/cn/hnthyy/thmz/controller/mz/MzyReqrecController.java

@@ -643,15 +643,13 @@ public class MzyReqrecController {
             if (mzyZdChargeType != null) {
                 mzyReqrec.setChargeType(mzyZdChargeType.getName());
             }
-            if ("a".equals(mzyReqrec.getAmpm())) {
-                mzyReqrec.setAmpm("上午");
-            } else if ("p".equals(mzyReqrec.getAmpm())) {
-                mzyReqrec.setAmpm("下午");
-            } else if ("n".equals(mzyReqrec.getAmpm())) {
-                mzyReqrec.setAmpm("中午");
-            } else if ("d".equals(mzyReqrec.getAmpm())) {
-                mzyReqrec.setAmpm("全天");
+            MzZdWorkTime mzZdWorkTime = mzZdWorkTimeService.queryMzZdWorkTimeByCode(mzyReqrec.getAmpm());
+            if (mzZdWorkTime == null) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "号段不存在");
+                return resultMap;
             }
+            mzyReqrec.setAmpm(mzZdWorkTime.getName());
             BigDecimal totalFee = mzyReqrec.getReqFee().add(mzyReqrec.getClinicFee()).add(mzyReqrec.getOthFee()).add(mzyReqrec.getBrochureFee());
             if (totalFee.compareTo(BigDecimal.ZERO) == 0) {
                 resultMap.put("code", -1);

src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzZdWorkTimeMapper.java

@@ -11,7 +11,7 @@ public interface MzZdWorkTimeMapper {
      * 查询所有在使用中的时间区间
      * @return
      */
-    @Select("select code,rtrim(name) name,rtrim(start_time) start_time,rtrim(end_time) end_time,del_flag from mz_zd_work_time WITH(NOLOCK) where del_flag =0")
+    @Select("select code,rtrim(name) name,rtrim(start_time) start_time,rtrim(end_time) end_time,del_flag from mz_zd_work_time WITH(NOLOCK) where del_flag =0 order by code")
     List<MzZdWorkTime> selectAllMzZdWorkTime();
 
     /**
@@ -19,7 +19,7 @@ public interface MzZdWorkTimeMapper {
      * @param code
      * @return
      */
-    @Select("select code,rtrim(name) name,rtrim(start_time) start_time,rtrim(end_time) end_time,del_flag from mz_zd_work_time WITH(NOLOCK) where code =#{code} and del_flag =0 ")
+    @Select("select code,rtrim(name) name,rtrim(start_time) start_time,rtrim(end_time) end_time,del_flag from mz_zd_work_time WITH(NOLOCK) where code =#{code} and del_flag =0 order by code")
     MzZdWorkTime selectMzZdWorkTimeByCode(@Param("code")String code);
 
 }

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzChargeDetailServiceImpl.java

@@ -960,7 +960,10 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         Map<String, String> employeeMap = null;
         List<Employee> employees = employeeService.queryByCodes(doctorCodes);
         if (employees != null) {
-            employeeMap = employees.stream().collect(Collectors.toMap(Employee::getEmployeeCode, Employee::getEmployeeName));
+            //如果有重复的key，返回后者  https://blog.csdn.net/m0_52069457/article/details/122673251 参考例子
+            employeeMap = employees.stream().collect(Collectors.toMap(Employee::getEmployeeCode, Employee::getEmployeeName,(value1,value2)->{
+                return value1;
+            }));
         }
         for (MzChargeDetail mzChargeDetail : mzChargeDetails) {
             if (mzChargeDetail != null) {

src/main/java/cn/hnthyy/thmz/vo/MzPrescriptionVo.java

@@ -19,17 +19,6 @@ public class MzPrescriptionVo {
     private String visitDeptCode;
     //医生代码
     private String doctorCode;
-    //    //检查部位  废弃，不需要上传
-//    private String inspectPart;
-//    //申请说明  病史及症状  废弃，不需要上传
-//    private String reqComment;
-//    //申请人体征描述 废弃，不需要上传
-//    private String reqTzComment;
-//    @DateTimeFormat(pattern = "yyyy-MM-dd")
-//    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
-//    //病人出生日期  废弃，不需要上传
-//    private Date birthDate;
-
     //0-初诊  1-复诊
     private Integer firstOrNot;
     //疾病代码 诊断编码

src/main/resources/otherSource/savePrescription.text

@@ -1,23 +1,16 @@
-{
-    "patientId":"290509-4",
-    "visitDeptCode":"1002030",
-    "doctorCode":"00000",
-    "firstOrNot":"0 0-初诊  1-复诊",
-    "icdCode":"ZD001",
-    "icdText":"测试诊断",
-    "jzFlag":"1",
-    "serialNo":"分诊流水号 非必填",
+{   "visitDeptCode":"1002030 科室编码",
+    "doctorCode":"00000 医生编码",
+    "patientId":"290509-4 患者id",
+    "icdCode":"A01.000x014 诊断编码，多个诊断用英文逗号分隔",
+    "icdText":"诊断名称，多个诊断用英文逗号分隔",
     "mzBlRecord":{
-        "firstOrNot":"0",
-        "emrChiefComplaint":"测试主诉",
+        "emrChiefComplaint":"主诉",
         "emrHpi":"现病史",
         "emrPs":"既往史",
         "emrPe":"体格检查",
-        "emrFzjc":"辅助检查",
-        "emrProcess":"处理意见",
-        "emrXyy":"现用药",
-        "emrYypg":"营养评估",
-        "emrGnpg":"功能评估",
+        "emrXyy":"无 现用药",
+        "emrYypg":"无 营养评估",
+        "emrGnpg":"无 功能评估",
         "emrJkjy":"健康教育",
         "personalHistory":"个人病史",
         "familyHistory":"家族史",
@@ -34,64 +27,83 @@
     },
     "mzChargeDetailList":[
         {
-            "chargeItemCode":"01398",
-            "serial":"99",
-            "quantity":"9",
-            "drugQuan":"1",
-            "drugUnit":"04",
-            "frequency":"ONCE",
-            "orderDays":"6",
-            "paySelf":"0",
-            "instructionCode":"",
-            "instructionText":"",
-            "orderNo":"",
-            "groupOrder":"",
-            "supplyCode":"",
+            "chargeItemCode":"02045 西药编码",
+            "serial":"01 药品规格",
+            "quantity":"12 药品数量",
+            "drugQuan":"10 单次用量",
+            "drugUnit":"06 单次用量单位编码",
+            "frequency":"Q2H 用药频率",
+            "orderDays":"1 处方天数",
+            "drugWin":"1 （西药传1）付数",
+            "instructionCode":"医嘱编码",
+            "instructionText":"医嘱描述",
+            "orderNo":1,
+            "groupOrder":"1 处方编组",
+            "supplyCode":"009 给药方式编码",
             "cyJssm":"",
             "cyDj":"",
             "cyFysm":"",
-            "tryFlag":"0",
-            "groupNo":""
-
+            "tryFlag":"0 皮试 1是0否"
+        },
+        {
+            "chargeItemCode":"40476 中药编码",
+            "serial":"01 中药默认01",
+            "quantity":"12 中药数量",
+            "drugQuan":"12 单次用量",
+            "drugUnit":"g 单位",
+            "frequency":"",
+            "orderDays":"1 处方天数",
+            "drugWin":"15 中药付数",
+            "instructionCode":"044 医嘱编码",
+            "instructionText":"后煎 医嘱描述",
+            "orderNo":6,
+            "groupOrder":"1",
+            "supplyCode":"",
+            "cyJssm":"加凉水 加水说明",
+            "cyDj":"草药代煎",
+            "cyFysm":"服用说明"
         },
         {
-            "chargeItemCode":"00045",
-            "serial":"99",
-            "quantity":"9",
-            "drugQuan":"1",
-            "drugUnit":"04",
-            "frequency":"ONCE",
-            "orderDays":"6",
-            "paySelf":"0",
-            "drugWin":"7",
+            "chargeItemCode":"019103 诊疗编码",
+            "serial":"",
+            "quantity":"1 数量",
+            "drugQuan":"1 单次数量 默认1",
+            "drugUnit":"",
+            "frequency":"",
+            "orderDays":"1 天数",
+            "drugWin":"1 默认1",
             "instructionCode":"",
             "instructionText":"",
-            "orderNo":"",
+            "orderNo":8,
             "groupOrder":"",
             "supplyCode":"",
             "cyJssm":"",
             "cyDj":"",
             "cyFysm":"",
-            "tryFlag":"0",
-            "groupNo":""
+            "execDept":"2010000 执行科室"
         }
     ],
     "mzYjReqList":[
         {
-            "orderCode":"000297",
-            "inspectPart":"检查部位",
-            "inspectStuff":"检验物",
-            "instructionCode":"",
-            "instructionText":"",
-            "orderNo":"1"
+            "orderCode":"001311 医技编码（检查检验）",
+            "inspectPart":"检查部位编码",
+            "inspectStuff":"0002 检验物编码",
+            "jyRemark":"医嘱",
+            "orderNo":7,
+            "execDept":"2010000"
         },
         {
-            "orderCode":"001312",
-            "inspectPart":"检查部位",
-            "inspectStuff":"检验物",
-            "instructionCode":"",
-            "instructionText":"",
-            "orderNo":"1"
+            "orderCode":"001277",
+            "inspectPart":"",
+            "inspectStuff":"0011",
+            "jyRemark":"",
+            "orderNo":7,
+            "execDept":"2010000"
         }
-    ]
-}
+    ],
+    "mzZyReq":{
+        "reqDept":"病区",
+        "smallDept":"小科室",
+        "admissStatus":"入院状态编码"
+    }
+}

src/main/resources/static/js/mz/clinic.js

@@ -2429,6 +2429,8 @@ function editPrescription(jsonData, type) {
         setCallBackArrays("prescriptionDetail_jcjyContent", jcjyArrays);
         setCallBackArrays("prescriptionDetail_zlContent", zlArrays);
         zyReqCallBack = $("#prescriptionDetail_zyReqContent").find("input").prop("checked");
+    }else if(type == 0){
+        zyReqCallBack=true;
     }
     var mzChargeDetailList = jsonData.mzChargeDetailList;
     var mzZyReq = jsonData.mzZyReq;

src/main/resources/static/js/mz/registration.js

@@ -1751,10 +1751,11 @@ function prn1Print(patientId, times) {
                 LODOP.ADD_PRINT_TEXT("37mm", "6mm", "50mm", "3mm", "看诊医生:" + temp.doctorCode);
                 LODOP.ADD_PRINT_TEXT("37mm", "56mm", "50mm", "3mm", "号段:" + temp.ampm);
                 LODOP.ADD_PRINT_TEXT("42mm", "6mm", "50mm", "3mm", "号别:" + temp.chargeType);
-                LODOP.ADD_PRINT_TEXT("42mm", "56mm", "50mm", "3mm", "挂号费:" + temp.reqFee);
-                LODOP.ADD_PRINT_TEXT("47mm", "6mm", "50mm", "3mm", "诊查费:" + temp.clinicFee);
-                LODOP.ADD_PRINT_TEXT("47mm", "56mm", "50mm", "3mm", "其他:" + temp.othFee);
-                LODOP.ADD_PRINT_TEXT("52mm", "6mm", "50mm", "3mm", "工本费:" + temp.brochureFee);
+                LODOP.ADD_PRINT_TEXT("42mm", "56mm", "50mm", "3mm", "就诊号:" + temp.reqOrder);
+                LODOP.ADD_PRINT_TEXT("47mm", "6mm", "50mm", "3mm", "挂号费:" + temp.reqFee);
+                LODOP.ADD_PRINT_TEXT("47mm", "56mm", "50mm", "3mm", "诊查费:" + temp.clinicFee);
+                LODOP.ADD_PRINT_TEXT("52mm", "6mm", "50mm", "3mm", "其他:" + temp.othFee);
+                LODOP.ADD_PRINT_TEXT("52mm", "56mm", "50mm", "3mm", "工本费:" + temp.brochureFee);
                 LODOP.ADD_PRINT_TEXT("65mm", "21mm", "60mm", "3mm", res.totalFee + " 元");
                 LODOP.ADD_PRINT_TEXT("72mm", "19mm", "60mm", "3mm", res.totalFeeStr);
                 LODOP.ADD_PRINT_TEXT("79mm", "0mm", "15mm", "3mm", res.year);//年

src/main/resources/static/js/zy/hospitalized.js

@@ -1019,10 +1019,11 @@ function prn1Print(patientId, times) {
                 LODOP.ADD_PRINT_TEXT("37mm", "6mm", "50mm", "3mm", "看诊医生:" + temp.doctorCode);
                 LODOP.ADD_PRINT_TEXT("37mm", "56mm", "50mm", "3mm", "号段:" + temp.ampm);
                 LODOP.ADD_PRINT_TEXT("42mm", "6mm", "50mm", "3mm", "号别:" + temp.chargeType);
-                LODOP.ADD_PRINT_TEXT("42mm", "56mm", "50mm", "3mm", "挂号费:" + temp.reqFee);
-                LODOP.ADD_PRINT_TEXT("47mm", "6mm", "50mm", "3mm", "诊查费:" + temp.clinicFee);
-                LODOP.ADD_PRINT_TEXT("47mm", "56mm", "50mm", "3mm", "其他:" + temp.othFee);
-                LODOP.ADD_PRINT_TEXT("52mm", "6mm", "50mm", "3mm", "工本费:" + temp.brochureFee);
+                LODOP.ADD_PRINT_TEXT("42mm", "56mm", "50mm", "3mm", "就诊号:" + temp.reqOrder);
+                LODOP.ADD_PRINT_TEXT("47mm", "6mm", "50mm", "3mm", "挂号费:" + temp.reqFee);
+                LODOP.ADD_PRINT_TEXT("47mm", "56mm", "50mm", "3mm", "诊查费:" + temp.clinicFee);
+                LODOP.ADD_PRINT_TEXT("52mm", "6mm", "50mm", "3mm", "其他:" + temp.othFee);
+                LODOP.ADD_PRINT_TEXT("52mm", "56mm", "50mm", "3mm", "工本费:" + temp.brochureFee);
                 LODOP.ADD_PRINT_TEXT("65mm", "21mm", "60mm", "3mm", res.totalFee + " 元");
                 LODOP.ADD_PRINT_TEXT("72mm", "19mm", "60mm", "3mm", res.totalFeeStr);
                 LODOP.ADD_PRINT_TEXT("79mm", "0mm", "15mm", "3mm", res.year);//年