优化

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

@@ -1842,10 +1842,9 @@ public class MzChargeDetailController {
             log.error("系统异常，错误信息{}", e.getMessage());
             return resultMap;
         } catch (Exception e) {
-            e.printStackTrace();
             resultMap.put("code", -1);
             resultMap.put("message", "门诊处方保存失败，请联系管理员");
-            log.error("系统异常，错误信息{}", e);
+            log.error("系统异常,保存处方失败,错误信息{}", e);
             log.error(JsonUtil.object2Json(mzPrescriptionVo));
             //保存就诊记录带id 因为跨数据库回滚失败零时方案，不做正常保存
             if (clinic != null) {

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

@@ -5859,7 +5859,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                     }
                     if(CollUtil.isNotEmpty(zdDiscountDetailMap)){
                             ZdDiscountDetail zdDiscountDetail;
-                            if("1".equals(Convert.toStr(mzChargeDetail.getReqYj(),"0"))){
+                            if("1".equals(Convert.toStr(mzChargeDetail.getReqYj(),"0")) && CollUtil.isNotEmpty(ReqNoGroup) && mzChargeDetail.getReqNo() != null && CollUtil.isNotEmpty(ReqNoGroup.get(mzChargeDetail.getReqNo()))){
 
                                  zdDiscountDetail = zdDiscountDetailMap.get(mzChargeDetail.getChargeItemCode()+","+ReqNoGroup.get(mzChargeDetail.getReqNo()).get(0).getOrderCode());
                             }else {

src/main/resources/templates/zy/hospitalized.html

@@ -69,7 +69,6 @@
                         <a id="seeHkb"><i class="fa fa-eye">&nbsp;查看户口本</i></a>
                         <a id="seeIdCard"><i class="fa fa-eye">&nbsp;查看身份证</i></a>
                         <a id="updateMzNo"><i class="fa fa-check-square-o" onclick="openSeeUpdatePatientIdModal()">&nbsp;修改门诊号</i></a>
-                        <a id="updateInpatientNo"><i class="fa fa-check-square-o">&nbsp;修改住院号</i></a>
                         <a onclick="saveZyPatient(false)" id="saveUser" hidden><i
                                 class="fa fa-user">&nbsp;保存患者信息</i></a>
                         <a id="copyAddress" hidden><i class="fa fa-copyright" onclick="copyAddress()">&nbsp;复制身份证地址</i></a>