解决门诊药品处方单个药品编辑保存后，新增医材精神类处方不分处方缺陷

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

@@ -2787,6 +2787,12 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             mzBlRecord = new MzBlRecord();
         }
         resultMap.put("mzBlRecord", mzBlRecord);
+        String icdText = StringUtils.isBlank(mzBlRecord.getTentativeDiagnosis()) ? "" : mzBlRecord.getTentativeDiagnosis();
+        if (mzVisitTable != null && mzVisitTable.getIcdText() != null && StringUtils.isNotBlank(mzVisitTable.getIcdText())) {
+            icdText = mzVisitTable.getIcdText()+icdText;
+            //results.put("icdText", StringUtils.isBlank(mzBlRecord.getTentativeDiagnosis())?mzVisitTable.getIcdText():mzVisitTable.getIcdText()+" "+mzBlRecord.getTentativeDiagnosis());
+        }
+        resultMap.put("icdText", icdText);
         return resultMap;
     }
 

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

@@ -2998,6 +2998,7 @@ function saveWesternMedicine(calculateTotalAmountFlag) {
     html += '<input type="hidden" class="temporary_items_medicalAdviceText" value="' + medicalAdviceText + '"/>';
     html += '<input type="hidden" class="temporary_items_packRetprice" value="' + packRetprice + '"/>';
     html += '<input type="hidden" class="temporary_items_tryFlag" value="' + tryFlag + '"/>';
+    html += '<input type="hidden" class="temporary_items_currentGroupNo" value="' + currentGroupNo + '"/>';
     html += '</div>';
 
     var tableId = $("#xyTab li.active").find("a").attr("href");
@@ -3166,6 +3167,8 @@ function editWesternMedicine(obj) {
         $("#tryFlag").parent().addClass("checked");
         $("#tryFlag").parent().parent().parent().removeClass("hide").addClass("in");
     }
+    //设置当前药品类型
+    $("#current_groupNo").val($(parentObject).find("input.temporary_items_currentGroupNo").val());
     $.ajax({
         type: "GET",
         url: '/thmz/getYpZdDictByCodeAndSerial?code=' + code + "&serial=" + serial,
@@ -3219,6 +3222,10 @@ function editWesternMedicine(obj) {
                     } else {
                         $("#tryFlag").parent().parent().parent().removeClass("in").addClass("hide");
                     }
+                    //厂家名称
+                    $("#manufactoryName").val(res.data.manufactoryName);
+                    //规格
+                    $("#specification").val(res.data.specification);
                 }
             } else {
                 errorMesage(res);
@@ -8277,7 +8284,7 @@ function printYjReq(patientId, times, type, printType) {
                 $("#patientAgeJcReq").text(mzPatientMi.age + "岁");
                 $("#responseTypeJcReq").text(mzPatientMi.responseTypeName);
                 $("#patientCardNoJcReq").text(mzPatientMi.icCardNo);
-                $("#icdTextJcReq").text(res.data.mzVisitTable.icdText);
+                $("#icdTextJcReq").text(res.data.icdText);
 
                 $("#patientIdJyReq").text(mzPatientMi.patientId);
                 $("#patientNameJyReq").text(mzPatientMi.name);
@@ -8285,7 +8292,7 @@ function printYjReq(patientId, times, type, printType) {
                 $("#patientAgeJyReq").text(mzPatientMi.age + "岁");
                 $("#responseTypeJyReq").text(mzPatientMi.responseTypeName);
                 $("#patientCardNoJyReq").text(mzPatientMi.icCardNo);
-                $("#icdTextJyReq").text(res.data.mzVisitTable.icdText);
+                $("#icdTextJyReq").text(res.data.icdText);
                 var mzBlRecord = res.data.mzBlRecord;
                 $("#jcReqEmrChiefComplaint").text(mzBlRecord.emrChiefComplaint);
                 $("#jcReqHis").text(mzBlRecord.emrHpi);