Merge branch 'dev-1.1.1' of https://172.16.32.165/hurugang/thmz_system into dev-1.1.1

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

@@ -63,7 +63,6 @@ public class MzPharmacyController {
      *
      * @return
      */
-    @UserLoginToken
     @RequestMapping(value = "/listMzChargeOrder", method = {RequestMethod.POST})
     public Map<String, Object> listMzChargeOrder(@RequestBody ChargeDetailPharmacyVo chargeDetailPharmacyVo) {
         Map<String, Object> resultMap = new HashMap<>();
@@ -327,7 +326,6 @@ public class MzPharmacyController {
      * @param mzChargeDetail
      * @return
      */
-    @UserLoginToken
     @RequestMapping(value = "/getFyclPrescriptionDetail", method = {RequestMethod.POST})
     public Map<String, Object> getFyclPrescriptionDetail(@RequestBody MzChargeDetail mzChargeDetail) {
         Map<String, Object> resultMap = new HashMap<>();
@@ -554,7 +552,6 @@ public class MzPharmacyController {
      * @param mzChargeDetail
      * @return
      */
-    @UserLoginToken
     @RequestMapping(value = "/getPrintPrescriptionData", method = {RequestMethod.POST})
     public Map<String, Object> getPrintPrescriptionData(@RequestBody MzChargeDetail mzChargeDetail, HttpServletRequest httpServletRequest) throws MzException {
         Map<String, Object> resultMap = new HashMap<>();
@@ -667,19 +664,18 @@ public class MzPharmacyController {
      * 查询未打印的处方数据
      * @return
      */
-    @UserLoginToken
-    @RequestMapping(value = "/getPrintPrescriptionDatas", method = {RequestMethod.POST})
-    public Map<String, Object> getPrintPrescriptionDatas(HttpServletRequest httpServletRequest) throws MzException {
+    @RequestMapping(value = "/getPrintPrescriptionDatas", method = {RequestMethod.GET})
+    public Map<String, Object> getPrintPrescriptionDatas(@RequestParam("groupNo") String groupNo, HttpServletRequest httpServletRequest) throws MzException {
         Map<String, Object> resultMap = new HashMap<>();
-        User tokenUser = TokenUtil.getUser(httpServletRequest);
+        //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.queryMzPrescriptionByPrintFlag(0);
+//            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++) {
                 MzChargeDetail prescription = prescriptions.get(j);
@@ -730,10 +726,10 @@ public class MzPharmacyController {
                     String manufactoryName = ypZdManufactoryService.queryYpZdManufactoryByCode(ypZdDict.getManuCode());
                     map.put("manufactoryName", manufactoryName);//生产厂家
                     String packUnitName = mzPharmacyService.getYpUnitName(ypZdDict.getPackUnit());
-                    if (chargeDetail.getGroupNo().equals("81")) {
+                    if (groupNo.equals("81")) {
                         map.put("ypUnitName", packUnitName);//单位
                         map.put("drugUnitName", packUnitName);//一次剂量单位
-                    } else if (chargeDetail.getGroupNo().equals("71")) {
+                    } else if (groupNo.equals("71")) {
                         String drugUnitName = mzPharmacyService.getYpUnitName(chargeDetail.getDrugUnit());
                         map.put("ypUnitName", packUnitName);//单位
                         map.put("drugUnitName", drugUnitName);//一次剂量单位

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

@@ -86,7 +86,6 @@ public class YpfydlController {
      *
      * @return
      */
-    @UserLoginToken
     @RequestMapping(value = "/getToMedicineUser", method = {RequestMethod.GET})
     public Map<String, Object> getToMedicineUser(@RequestParam("groupNo") String groupNo) {
         Map<String, Object> resultMap = new HashMap<>();
@@ -96,8 +95,6 @@ public class YpfydlController {
                 resultMap.put("message", "查询未发药药品失败,未选择药房");
                 return resultMap;
             }
-           /* DateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
-            Date myDate1 = dateFormat1.parse("2021-07-05");*/
             Date now = new Date();
             Date begin = DateUtil.getFirstSecond(now);
             Date end = DateUtil.getLastSecond(now);

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

@@ -1076,15 +1076,15 @@ public interface MzChargeDetailMapper {
     int setPrintFlag(@Param("patientId") String patientId, @Param("times") Integer times, @Param("orderNo") Integer orderNo);
 
     /**
-     * 根据打印标记查询当天处方信息
+     * 查询当天未发药的处方
      *
      * @param printFlag
      * @return
      */
-    @Select("select patient_id,times,order_no,group_no from mz_charge_detail c,yp_zd_dict y where c.print_flag=#{printFlag} and c.group_no = '71'" +
+    @Select("select patient_id,times,order_no,group_no from mz_charge_detail c,yp_zd_dict y where confirm_flag=0 and serial_no>0 and c.print_flag=#{printFlag} and c.group_no = #{groupNo}" +
             "        and c.charge_item_code = y.code and c.serial = y.serial and y.class_code != '210100'" +
             "        and datediff(day, c.charge_date,getdate())=0 group by c.patient_id, c.times, c.order_no,c.group_no")
-    List<MzChargeDetail> selectMzPrescriptionByPrintFlag(@Param("printFlag") Integer printFlag);
+    List<MzChargeDetail> selectMzPrescription(@Param("printFlag") Integer printFlag,@Param("groupNo") String groupNo);
 
     /**
      * 划价时间为空的数据总数

src/main/java/cn/hnthyy/thmz/service/his/mz/MzChargeDetailService.java

@@ -358,7 +358,7 @@ public interface MzChargeDetailService {
      * @param printFlag
      * @return
      */
-    List<MzChargeDetail> queryMzPrescriptionByPrintFlag(Integer printFlag);
+    List<MzChargeDetail> queryMzPrescription(Integer printFlag, String groupNo);
 
     /**
      * 清洗历史数据

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

@@ -2121,8 +2121,8 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
     }
 
     @Override
-    public List<MzChargeDetail> queryMzPrescriptionByPrintFlag(Integer printFlag) {
-        return mzChargeDetailMapper.selectMzPrescriptionByPrintFlag(printFlag);
+    public List<MzChargeDetail> queryMzPrescription(Integer printFlag,String groupNo) {
+        return mzChargeDetailMapper.selectMzPrescription(printFlag, groupNo);
     }
 
     @Override

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

@@ -455,8 +455,8 @@ function printPrescriptions() {
         return errorMesageSimaple('打印机参数未设置，请在发药参数设置中设置');
     }
     $.ajax({
-        type: "POST",
-        url: '/thmz/getPrintPrescriptionDatas',
+        type: "GET",
+        url: '/thmz/getPrintPrescriptionDatas?groupNo='+groupNo,
         contentType: "application/json;charset=UTF-8",
         dataType: "json",
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},