货位号处理

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

@@ -690,16 +690,9 @@ public class MzPharmacyController {
      * @return
      */
     @RequestMapping(value = "/getPrintPrescriptionDatas", method = {RequestMethod.GET})
-    public Map<String, Object> getPrintPrescriptionDatas(@RequestParam("groupNo") String groupNo, HttpServletRequest httpServletRequest) throws MzException {
+    public Map<String, Object> getPrintPrescriptionDatas(@RequestParam("groupNo") String groupNo) {
         Map<String, Object> resultMap = new HashMap<>();
-        //User tokenUser = TokenUtil.getUser(httpServletRequest);
         try {
-//            DispensingWindows windows = dispensingWindowsService.queryLastDispensingWindowsByUserIdCode(tokenUser.getUserIdCode(),null);
-//            if (windows == null) {
-//                resultMap.put("code", -1);
-//                resultMap.put("message", "当前操作人未设置发药基础参数，请先设置！");
-//                return resultMap;
-//            }
             List<MzChargeDetail> prescriptions = mzChargeDetailService.queryMzPrescription(0, groupNo);
             List<Map> maps = new ArrayList<>();
             for (int j = 0; j < prescriptions.size(); j++) {
@@ -707,6 +700,12 @@ public class MzPharmacyController {
                 Map<String, Object> printMap = new HashMap<>();
                 MzPatientMi mzPatientMi = mzPatientMiService.queryByPatientId(prescription.getPatientId());
                 MzVisitTable visit = mzVisitTableService.queryByPatientIdAndTimes(prescription.getPatientId(), prescription.getTimes());
+                if(StringUtils.isBlank(visit.getIcdText())){
+                    MzBlRecord mzBlRecord = mzBlRecordService.queryMzBlRecordByPatientIdAndTimes(prescription.getPatientId(), prescription.getTimes());
+                    printMap.put("icdText", mzBlRecord.getTentativeDiagnosis());//诊断
+                }else{
+                    printMap.put("icdText", visit.getIcdText());
+                }
                 printMap.put("patientId", prescription.getPatientId());
                 printMap.put("ybCardNo", mzPatientMi.getYbCardNo());
                 printMap.put("icCardNo", mzPatientMi.getIcCardNo());
@@ -717,7 +716,6 @@ public class MzPharmacyController {
                 printMap.put("socialNo", mzPatientMi.getSocialNo());
                 printMap.put("phoneNo", mzPatientMi.getPhoneNo());
                 printMap.put("address", mzPatientMi.getAddress());
-                printMap.put("icdText", visit.getIcdText());//诊断
                 prescription.setBillItemCode("TC");
                 List<MzChargeDetail> mzChargeDetails = mzChargeDetailService.getMzChargeDetailList(prescription);
                 if (mzChargeDetails.size() > 0) {
@@ -748,6 +746,8 @@ public class MzPharmacyController {
                     map.put("specification", ypZdDict.getSpecification());//规格
                     map.put("drugFlag", ypZdDict.getDrugFlag());//毒麻标志
                     map.put("psFlag", ypZdDict.getPsFlag());//是否需要皮试
+                    YpBaseYf ypBaseYf = ypBaseYfService.queryYpBaseYf(chargeDetail.getChargeItemCode(), chargeDetail.getSerial(), chargeDetail.getGroupNo());
+                    map.put("location",ypBaseYf.getLocation()==null?"":ypBaseYf.getLocation());
                     String manufactoryName = ypZdManufactoryService.queryYpZdManufactoryByCode(ypZdDict.getManuCode());
                     map.put("manufactoryName", manufactoryName);//生产厂家
                     String packUnitName = mzPharmacyService.getYpUnitName(ypZdDict.getPackUnit());