Prechádzať zdrojové kódy

指引单和外配药优化

lihong 10 mesiacov pred
rodič
commit
3997cafde6

+ 1 - 4
src/main/java/cn/hnthyy/thmz/controller/api/MedicalViewApiController.java

@@ -628,7 +628,7 @@ public class MedicalViewApiController {
                 results.put("resultMessage", "未查询到待缴费记录");
                 return results;
             }
-            mzChargeDetailService.formatMzChargeDetail(mzChargeDetailList);
+            mzChargeDetailService.formatMzChargeDetail(mzChargeDetailList,false);
             List<Map<String, Object>> returnList = new ArrayList<>();
             for (MzChargeDetail mzChargeDetail : mzChargeDetailList) {
                 Clinic clinic = clinicService.queryByPatientIdAndTimesAndReceiptNo(mzChargeDetail.getPatientId(), mzChargeDetail.getTimes(), mzChargeDetail.getReceiptNo());
@@ -637,9 +637,6 @@ public class MedicalViewApiController {
                 }
                 // 0 普通门诊统筹处方  1 自费处方  2 门特处方
                 Integer vipFlag = 1;
-                if(clinic == null){
-                     clinic = clinicService.queryByPatientIdAndTimesAndReceiptNo(mzChargeDetail.getPatientId(), mzChargeDetail.getTimes(), 0);
-                }
                 if(clinic != null){
                     vipFlag =  Convert.toInt(clinic.getZgmztczf(),0) == 0 ? 1 : 0;
                 }

+ 22 - 15
src/main/java/cn/hnthyy/thmz/controller/mz/MzChargeDetailController.java

@@ -135,8 +135,8 @@ public class MzChargeDetailController {
     @Resource
     WpMzPrescriptionService wpMzPrescriptionService;
 
-    @Value("${healthEducationUrl}")
-    private String healthEducationUrl;
+    //@Value("${healthEducationUrl}")
+    //private String healthEducationUrl;
     @Value("${wxPayQrUrl}")
     private String wxPayQrUrl;
 
@@ -220,7 +220,7 @@ public class MzChargeDetailController {
                 pageViewVo.setTotal(mzChargeDetailService.countMzChargeDetail(mzChargeDetailPageDto));
                 mzChargeDetails = mzChargeDetailService.queryMzChargeDetailWithPage(mzChargeDetailPageDto);
             }
-            mzChargeDetailService.formatMzChargeDetail(mzChargeDetails);
+            mzChargeDetailService.formatMzChargeDetail(mzChargeDetails,true);
             pageViewVo.setData(mzChargeDetails);
             resultMap.put("code", 0);
             resultMap.put("message", "查询费用列表信息成功");
@@ -702,7 +702,7 @@ public class MzChargeDetailController {
             returnMzChargeDetail.setRefundFee(oriAmount.subtract(returnMzChargeDetail.getAmount()).setScale(2, BigDecimal.ROUND_HALF_UP));
             List<MzChargeDetail> realMzChargeDetails = Arrays.asList(returnMzChargeDetail);
             pageViewVo.setTotal(realMzChargeDetails.size());
-            mzChargeDetailService.formatMzChargeDetail(realMzChargeDetails);
+            mzChargeDetailService.formatMzChargeDetail(realMzChargeDetails,true);
             int ybCount = mzPatientMiService.queryCountYbZf(mzDepositFileVo.getPatientId(), mzDepositFileVo.getTimes());
             if(CollUtil.isNotEmpty(realMzChargeDetails)){
                 realMzChargeDetails.forEach(item->{
@@ -2124,14 +2124,19 @@ public class MzChargeDetailController {
             results = getChargeDetailFee(patientId, times, 1, null, httpServletRequest);
             BigDecimal selfAmount = (BigDecimal) results.get("totalAmount");
             if (selfAmount != null) {
+                String wxPayUrl = wxPayQrUrl.replace("patientId", patientId);
                 String payQrcode = haiCiAdapterService.genMzPayQrcode(selfAmount.multiply(BigDecimal.valueOf(100)).intValue(), patientId, patientId + "_" + times + "_1");
                 if (payQrcode != null) {
                     results.put("payQrcode", payQrcode);
                 }
-                results.put("healthEducationUrl", healthEducationUrl);
-                String wxPayUrl = wxPayQrUrl.replace("patientId", patientId);
+                //results.put("healthEducationUrl", healthEducationUrl);
                 results.put("wxPayQrUrl", wxPayUrl);
             }
+            if(Convert.toInt(results.get("code")) == 0){
+                // 获取指引单项目指引数据
+                List<Map<String,Object>> guideCardData = mzChargeDetailService.getChargeDetailForGuideCard(patientId,times);
+                results.put("guideCardData", guideCardData);
+            }
             return results;
         } catch (Exception e) {
             if (results == null) {
@@ -2268,15 +2273,17 @@ public class MzChargeDetailController {
                 }
                 totalAmount = totalAmount.setScale(2, BigDecimal.ROUND_HALF_UP);
                 BigDecimal selfAmount = totalAmount;
-                User tokenUser = TokenUtil.getUser(httpServletRequest);
-                PayInfo payInfo = tsmzService.preSettle(tokenUser.getUserIdCode(), patientId, times);
-                if (payInfo != null && payInfo.getCode() == 0) {
-                    //个人医保账户支付
-                    results.put("acctPay", payInfo.getAcctPay());
-                    //医保统筹报销
-                    results.put("fundPay", payInfo.getFundPay());
-                    selfAmount = totalAmount.subtract(payInfo.getAcctPay()).subtract(payInfo.getFundPay());
-                }
+                //User tokenUser = TokenUtil.getUser(httpServletRequest);
+                //PayInfo payInfo = tsmzService.preSettle(tokenUser.getUserIdCode(), patientId, times);
+                //if (payInfo != null && payInfo.getCode() == 0) {
+                //    //个人医保账户支付
+                //    results.put("acctPay", payInfo.getAcctPay());
+                //    //医保统筹报销
+                //    results.put("fundPay", payInfo.getFundPay());
+                //    selfAmount = totalAmount.subtract(payInfo.getAcctPay()).subtract(payInfo.getFundPay());
+                //}
+                results.put("acctPay", 0);
+                results.put("fundPay", 0);
                 results.put("code", 0);
                 results.put("message", "查询门诊订单金额与支付明细成功");
                 results.put("totalAmount", totalAmount);

+ 2 - 0
src/main/java/cn/hnthyy/thmz/entity/his/mz/MzBlRecord.java

@@ -23,6 +23,8 @@ public class MzBlRecord extends PageBean {
     private Date visitDate;
     //医生编码
     private String doctorCode;
+    //医生名称
+    private String doctorName;
     //部门编码
     private String deptCode;
 

+ 40 - 0
src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzChargeDetailMapper.java

@@ -1183,4 +1183,44 @@ public interface MzChargeDetailMapper {
     void updateCashIdByPatientId(@Param("userIdCode") String userIdCode, @Param("mzDepositFileVo") MzDepositFileVo mzDepositFileVo);
     @Delete(" delete from  mz_charge_detail where patient_id =#{patientId} and times = #{times} ")
     int deleteChargeDetailByPatientIdAndTimes(@Param("patientId") String patientId, @Param("times")Integer times);
+    /**
+     * @description: 获取指引单项目指引数据
+     * @author: lihong
+     * @date: 2025/1/16 16:28
+     * @param: patientId
+     * @param: times
+     * @return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     **/
+    @Select(" select type='诊疗服务',c.name name,c.office_pos address  " +
+            "from mz_charge_detail a,zd_charge_item b,zd_unit_code c  " +
+            "where patient_id=#{patientId} and times=#{times} and req_no=0  " +
+            "  and a.charge_item_code=b.code  " +
+            "  and a.exec_dept=c.code  " +
+            "  and c.office_pos is not null  " +
+            "  and a.exec_dept!='2060500'  " +
+            "group by c.name,c.office_pos  " +
+            "union all  " +
+            "select type='检查',c.name name,d.office_pos address  " +
+            "from mz_yj_req a,jc_zd_item b,jc_zd_class c,zd_unit_code d  " +
+            "where patient_id=#{patientId} and times=#{times}  " +
+            "  and a.order_code=b.code  " +
+            "  and b.class=c.code  " +
+            "  and a.exec_dept=d.code  " +
+            "  and d.office_pos is not null  " +
+            "group by c.name,a.exec_dept,d.office_pos  " +
+            "union all  " +
+            "select type='药品',c.group_name name,c.office_pos address  " +
+            "from mz_charge_detail a,yp_zd_group_name c  " +
+            "where patient_id=#{patientId} and times=#{times}  " +
+            "  and a.group_no=c.group_no  " +
+            "group by c.group_name,c.office_pos  " +
+            "union all  " +
+            "select type='检验化验',d.name name,(select office_pos from zd_unit_code where code=a.exec_dept) address  " +
+            "from mz_yj_req a,jy_zd_item b,zd_unit_code d  " +
+            "where patient_id=#{patientId} and times=#{times}  " +
+            "  and a.order_code=b.code  " +
+            "  and a.exec_dept=d.code  " +
+            "group by a.exec_dept,d.name  " +
+            "order by type,address,name ")
+    List<Map<String, Object>> getChargeDetailForGuideCard(@Param("patientId") String patientId, @Param("times") Integer times);
 }

+ 11 - 2
src/main/java/cn/hnthyy/thmz/service/his/mz/MzChargeDetailService.java

@@ -286,10 +286,10 @@ public interface MzChargeDetailService {
 
     /**
      * 格式化收费记录 构造包含病人信息的挂号记录视图
-     *
+     *vistTypeFlag 是否查询身份
      * @param mzChargeDetails
      */
-    void formatMzChargeDetail(List<MzChargeDetail> mzChargeDetails);
+    void formatMzChargeDetail(List<MzChargeDetail> mzChargeDetails,boolean vistTypeFlag);
 
     /**
      * 将套餐归类,并计算总费用
@@ -610,4 +610,13 @@ public interface MzChargeDetailService {
     Map<String, Object> getDeposFiles(String opId, MzDepositFileVo mzDepositFileVo, Date now, int times, int serialNo, BigDecimal totalPayable, List<MzDepositFile> fullNewMzDepositFiles, boolean allRefund, List<MzDepositFile> newMzDepositFiles, boolean ybFlag);
 
     int deleteChargeDetailByPatientIdAndTimes(String patientId, Integer times);
+    /**
+     * @description:  获取指引单项目指引数据
+     * @author: lihong
+     * @date: 2025/1/16 16:26
+     * @param: patientId
+     * @param: times
+     * @return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     **/
+    List<Map<String, Object>> getChargeDetailForGuideCard(String patientId, Integer times);
 }

+ 3 - 2
src/main/java/cn/hnthyy/thmz/service/his/mz/WpMzPrescriptionService.java

@@ -8,6 +8,7 @@ import cn.hnthyy.thmz.entity.his.mz.RxMdtrtinfo;
 import cn.hnthyy.thmz.entity.his.mz.RxReceiptinfo;
 import cn.hnthyy.thmz.entity.his.mz.ZdRxMedicine;
 import cn.hnthyy.thmz.entity.his.zd.ZdUnitCode;
+import cn.hnthyy.thmz.entity.his.zy.ZyActpatient;
 import cn.hnthyy.thmz.vo.MzPrescriptionVo;
 
 import java.util.Date;
@@ -60,7 +61,7 @@ public interface WpMzPrescriptionService {
      * @param: zdUnitCode
      * @param: employee
      **/
-   void convertRxMdtrtinfo(MzPrescriptionVo mzPrescriptionVo, String hospRxno, Date now, MzPatientMi mzPatientMi, ZdUnitCode zdUnitCode, Employee employee);
+   void convertRxMdtrtinfo(MzPrescriptionVo mzPrescriptionVo, String hospRxno, Date now, MzPatientMi mzPatientMi, ZdUnitCode zdUnitCode, Employee employee,ZyActpatient zyActpatient);
     /**
      * @description:转换处方信息
      * @author: lihong
@@ -70,7 +71,7 @@ public interface WpMzPrescriptionService {
      * @param: now
      * @param: times
      **/
-    void convertRxReceiptinfo(MzPrescriptionVo mzPrescriptionVo, String hospRxno, Date now, int times);
+    void convertRxReceiptinfo(MzPrescriptionVo mzPrescriptionVo, String hospRxno, Date now, int times, ZyActpatient zyActpatient);
 
     ZdRxMedicine queryRxMedicineByCode(String medListCodg);
     /** 查询剂型

+ 25 - 5
src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzChargeDetailServiceImpl.java

@@ -1164,7 +1164,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
     }
 
     @Override
-    public void formatMzChargeDetail(List<MzChargeDetail> mzChargeDetails) {
+    public void formatMzChargeDetail(List<MzChargeDetail> mzChargeDetails,boolean vistTypeFlag) {
         if (mzChargeDetails == null) {
             return;
         }
@@ -1179,8 +1179,10 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         }
         for (MzChargeDetail mzChargeDetail : mzChargeDetails) {
             if (mzChargeDetail != null) {
-                mzChargeDetail.setOrderTypeName(mzOrderDetailService.queryOrderTypeName(mzChargeDetail.getPatientId(),mzChargeDetail.getTimes()));
-                mzChargeDetail.setVisitTypeName(shareholderCardService.queryVisitTypeName(mzChargeDetail.getPatientId()));
+                if(vistTypeFlag){
+                    mzChargeDetail.setOrderTypeName(mzOrderDetailService.queryOrderTypeName(mzChargeDetail.getPatientId(),mzChargeDetail.getTimes()));
+                    mzChargeDetail.setVisitTypeName(shareholderCardService.queryVisitTypeName(mzChargeDetail.getPatientId()));
+                }
                 mzChargeDetail.setWarnDept(zdUnitCodeService.queryDeptNameByIdInCache(mzChargeDetail.getWarnDept()));
                 if (employeeMap != null) {
                     String doctorCode = employeeMap.get(mzChargeDetail.getDoctorCode());
@@ -2955,8 +2957,9 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
               }
           }
           if(needPatient){
-              wpMzPrescriptionService.convertRxMdtrtinfo(mzPrescriptionVo, hospRxno, now,mzPatientMi,zdUnitCode,employee);
-              wpMzPrescriptionService.convertRxReceiptinfo(mzPrescriptionVo, hospRxno, now,times);
+              ZyActpatient zyActpatient = zyActpatientService.queryZyActpatientByPatientId(mzPrescriptionVo.getPatientId());
+              wpMzPrescriptionService.convertRxMdtrtinfo(mzPrescriptionVo, hospRxno, now,mzPatientMi,zdUnitCode,employee,zyActpatient);
+              wpMzPrescriptionService.convertRxReceiptinfo(mzPrescriptionVo, hospRxno, now,times,zyActpatient);
           }
       }
     }
@@ -3670,6 +3673,10 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             //因为16年前没有病历数据
             mzBlRecord = new MzBlRecord();
         }
+        if(StringUtils.isNotBlank(mzBlRecord.getDoctorCode())){
+            Employee employee = employeeService.queryByUserCode(mzBlRecord.getDoctorCode());
+            mzBlRecord.setDoctorName(employee == null ? "" : employee.getEmployeeName());
+        }
         mzPrescriptionVo.setFirstOrNot(mzVisitTable.getFirstOrNot());
         mzPrescriptionVo.setIcdCode(mzVisitTable.getIcdCode());
         String icdText = StringUtils.isBlank(mzBlRecord.getTentativeDiagnosis()) ? "" : mzBlRecord.getTentativeDiagnosis();
@@ -5092,6 +5099,19 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         return mzChargeDetailMapper.deleteChargeDetailByPatientIdAndTimes(patientId,times);
     }
 
+    /**
+     * @description: 获取指引单项目指引数据
+     * @author: lihong
+     * @date: 2025/1/16 16:26
+     * @param: patientId
+     * @param: times
+     * @return: java.util.List<java.util.Map < java.lang.String, java.lang.Object>>
+     */
+    @Override
+    public List<Map<String, Object>> getChargeDetailForGuideCard(String patientId, Integer times) {
+        return mzChargeDetailMapper.getChargeDetailForGuideCard(patientId,times);
+    }
+
     private void dealDesPosFile(String opId, Date now, int times, int serialNo, BigDecimal totalPayable, List<MzDepositFile> fullNewMzDepositFiles, List<MzDepositFile> newMzDepositFiles, BigDecimal byjzAmount, BigDecimal notByjzAmount, BigDecimal posAmount, List<MzDepositFile> needRefundList, Map<String, MzDepositFile> relationMap, List<MzDepositFile> refundMzDepositFiles, MzDepositFile m) {
         //应付小于等于实际已经支付的非记账总额
         if (totalPayable.compareTo(notByjzAmount) <= 0) {

+ 13 - 10
src/main/java/cn/hnthyy/thmz/service/impl/his/mz/WpMzPrescriptionImpl.java

@@ -14,10 +14,10 @@ import cn.hnthyy.thmz.entity.his.zy.ZyActpatient;
 import cn.hnthyy.thmz.mapper.his.mz.WpMzPrescriptionMapper;
 import cn.hnthyy.thmz.service.his.mz.WpMzPrescriptionService;
 import cn.hnthyy.thmz.service.his.zd.ZdIcdCodeService;
-import cn.hnthyy.thmz.service.his.zy.ZyActpatientService;
 import cn.hnthyy.thmz.vo.MzPrescriptionVo;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -43,8 +43,6 @@ public class WpMzPrescriptionImpl implements WpMzPrescriptionService {
     private WpMzPrescriptionMapper dao;
     @Resource
     private ZdIcdCodeService zdIcdCodeService;
-    @Resource
-    private ZyActpatientService zyActpatientService;
 
     /**
      * @param label
@@ -153,11 +151,18 @@ public class WpMzPrescriptionImpl implements WpMzPrescriptionService {
      * @param: employee
      */
     @Override
-    public void convertRxMdtrtinfo(MzPrescriptionVo mzPrescriptionVo, String hospRxno, Date now, MzPatientMi mzPatientMi, ZdUnitCode zdUnitCode, Employee employee) {
+    public void convertRxMdtrtinfo(MzPrescriptionVo mzPrescriptionVo, String hospRxno, Date now, MzPatientMi mzPatientMi, ZdUnitCode zdUnitCode, Employee employee,ZyActpatient zyActpatient) {
         RxMdtrtinfo rxMdtrtinfo = new RxMdtrtinfo();
         rxMdtrtinfo.setHospRxno(hospRxno);
-        rxMdtrtinfo.setIptOtpNo(mzPrescriptionVo.getPatientId());
-        rxMdtrtinfo.setOtpIptFlag(1);
+        if(zyActpatient != null){
+            rxMdtrtinfo.setIptOtpNo(zyActpatient.getInpatientNo());
+            rxMdtrtinfo.setOtpIptFlag(2);
+            rxMdtrtinfo.setMdtrtTime(zyActpatient.getYbRegisterDate());
+        }else {
+            rxMdtrtinfo.setIptOtpNo(mzPrescriptionVo.getPatientId());
+            rxMdtrtinfo.setOtpIptFlag(1);
+            rxMdtrtinfo.setMdtrtTime(now);
+        }
         rxMdtrtinfo.setCertno(mzPatientMi.getSocialNo());
         rxMdtrtinfo.setPsnCertType(mzPatientMi.getCertificateType());
         rxMdtrtinfo.setPatnAge(Convert.toBigDecimal(mzPatientMi.getAgeForYear()));
@@ -178,7 +183,6 @@ public class WpMzPrescriptionImpl implements WpMzPrescriptionService {
                 rxMdtrtinfo.setDrProfttlName(proList.get(0).get("name"));
             }
         }
-        rxMdtrtinfo.setMdtrtTime(now);
         rxMdtrtinfo.setSpDiseFlag("0");
         if(CollUtil.isNotEmpty(mzPrescriptionVo.getRxDiseinfoList())){
             rxMdtrtinfo.setMaindiagCode(mzPrescriptionVo.getRxDiseinfoList().get(0).getDiagCode());
@@ -197,7 +201,7 @@ public class WpMzPrescriptionImpl implements WpMzPrescriptionService {
      * @param: times
      */
     @Override
-    public void convertRxReceiptinfo(MzPrescriptionVo mzPrescriptionVo, String hospRxno, Date now, int times) {
+    public void convertRxReceiptinfo(MzPrescriptionVo mzPrescriptionVo, String hospRxno, Date now, int times,ZyActpatient zyActpatient) {
         RxReceiptinfo rxReceiptinfo = new RxReceiptinfo();
         rxReceiptinfo.setHospRxno(hospRxno);
         rxReceiptinfo.setPatNo(mzPrescriptionVo.getPatientId());
@@ -209,8 +213,7 @@ public class WpMzPrescriptionImpl implements WpMzPrescriptionService {
         rxReceiptinfo.setValiDays(3);
         rxReceiptinfo.setRxCotnFlag(0);
         rxReceiptinfo.setLongRxFlag(0);
-        rxReceiptinfo.setValiEndTime(cn.hutool.core.date.DateUtil.offsetDay(now,rxReceiptinfo.getValiDays()));
-        ZyActpatient zyActpatient = zyActpatientService.queryZyActpatientByPatientId(mzPrescriptionVo.getPatientId());
+        rxReceiptinfo.setValiEndTime(DateUtil.offsetDay(now,rxReceiptinfo.getValiDays()));
         if(zyActpatient != null){
             rxReceiptinfo.setZyNo(zyActpatient.getInpatientNo());
             rxReceiptinfo.setZyTimes(zyActpatient.getAdmissTimes());

BIN
src/main/resources/static/images/zydfooter.png


+ 18 - 26
src/main/resources/static/js/mz/clinic.js

@@ -11584,8 +11584,9 @@ function printPrescription(patientId, times, clnicId, payMark, printType) {
                     $("#sfTypeId").text(mzPatientMi.responseTypeName);
                     $("#zdPrescription").text(res.data.icdText);
                     $("#patientIdGuideCard").text(mzPatientMi.patientId);
+                    $("#doctorGuideCard").text(res.data.mzBlRecord.doctorName);
                     $("#patientNameGuideCard").text(mzPatientMi.name);
-                    $("#patientDateGuideCard").text(format(new Date(), "yyyy-MM-dd"));
+                    $("#patientDateGuideCard").text(format(new Date(), "yyyy/MM/dd/HH:mm"));
                     JsBarcode("#cfBarcode", patientId, {
                         lineColor: '#333', //线条颜色
                         width: 1, //线宽
@@ -12034,46 +12035,37 @@ function printPrescription(patientId, times, clnicId, payMark, printType) {
                                     // LODOP.ADD_PRINT_HTM("0mm", "5mm", "140mm", "200mm", strStyle + document.getElementById("self_pay_table").innerHTML);
                                     index++;
                                 }
-                                if (res.data != null && res.data.length > 0) {
-                                    var html = "";
-                                    for (var i = 0; i < res.data.length; i++) {
-                                        html += "<tr><td>" + res.data[i].itemType + "</td><td>" + Division(res.data[i].itemTotalFee, 1) + "</td><td>" + res.data[i].execDeptName + "</td><td>" + res.data[i].execDeptAddress + "</td></tr>"
+                                if (res.guideCardData != null && res.guideCardData.length > 0) {
+                                    let html = `<tr style="font-weight: 700"><td>类别</td> <td>名称/科室</td><td>地址</td></tr>`;
+                                    for (var i = 0; i < res.guideCardData.length; i++) {
+                                        html += "<tr><td>" + res.guideCardData[i].type + "</td><td>" + res.guideCardData[i].name + "</td><td>" + res.guideCardData[i].address + "</td></tr>"
                                     }
                                     $("#guideCardDetail").html(html);
                                 }
                                 if (res.payQrcode != null && res.payQrcode != "") {
                                     new QRCode(document.getElementById("payQrcodeGuideCard"), res.payQrcode);  // 设置要生成二维码的链接
                                     $("canvas").attr("id", "erw");
-                                    var canvas = document.getElementById('erw');
-                                    var src = canvas.toDataURL("image/png");
-                                    //var strDataURI =canvas.toDataURL("image/png");
-                                    $("#payQrcodeGuideCard").html("<img src='" + src + "' style='width:100px;height:100px;'/><div style='width: 300px;margin-top: 10px;text-align: center;'>微信支付(全自费请扫此码)</div>");
-                                }
-                                if(!stringIsBlank(res.healthEducationUrl)){
-                                    new QRCode(document.getElementById("healthEducationCard"), res.healthEducationUrl);  // 设置要生成二维码的链接
-                                    $("canvas").attr("id", "erw");
                                     let canvas = document.getElementById('erw');
                                     let src = canvas.toDataURL("image/png");
-                                    $("#healthEducationCard").html("<img src='" + src + "' style='width:100px;height:100px;'/><div style='width: 100px;margin-top: 10px;text-align: center;'>健康宣教</div>");
+                                    let payQrcodeGuideCardHtml = `<img src="${src}" style="width: 100px;height: 100px"/><div style="width: 140px;margin-top: 2px;">微信支付(自费)</div>`;
+                                    $("#payQrcodeGuideCard").html(payQrcodeGuideCardHtml)
                                 }
+                                // if(!stringIsBlank(res.healthEducationUrl)){
+                                //     new QRCode(document.getElementById("healthEducationCard"), res.healthEducationUrl);  // 设置要生成二维码的链接
+                                //     $("canvas").attr("id", "erw");
+                                //     let canvas = document.getElementById('erw');
+                                //     let src = canvas.toDataURL("image/png");
+                                //     $("#healthEducationCard").html("<img src='" + src + "' style='width:100px;height:100px;'/><div style='width: 100px;margin-top: 10px;text-align: center;'>健康宣教</div>");
+                                // }
                                 if(!stringIsBlank(res.wxPayQrUrl)){
                                     new QRCode(document.getElementById("wxPayQrCard"), res.wxPayQrUrl);  // 设置要生成二维码的链接
                                     $("canvas").attr("id", "erw");
                                     let canvas = document.getElementById('erw');
                                     let src = canvas.toDataURL("image/png");
-                                    $("#wxPayQrCard").html("<img src='" + src + "' style='width:100px;height:100px;'/><div style='width: 500px;margin-top: 5px'>微信支付(含医保统筹请扫此码)</div>");
+                                    let wxPayQrCardHtml =`<img src="${src}" style="width: 100px;height: 100px"/><div style="width: 140px;margin-top: 2px;">微信支付(医保统筹)</div>`;
+                                    $("#wxPayQrCard").html(wxPayQrCardHtml);
                                 }
-
-                                // if (res.fundPay != undefined && res.fundPay != null) {
-                                //     $("#fundPayGuideCard").text("¥" + res.fundPay);
-                                // }
-                                // if (res.acctPay != undefined && res.acctPay != null) {
-                                //     $("#acctPayGuideCard").text("¥" + res.acctPay);
-                                // }
-                                // $("#selfAmountGuideCard").text("¥" + res.selfAmount);
-                                $("#totalAmountGuideCard").text("¥" + res.totalAmount);
-                                // $("#imgcode").JsBarcode(patientId);
-                                console.log(patientId);
+                                $("#totalAmountGuideCard").text("¥" + res.totalAmount+"元");
                                 JsBarcode('#imgcode', patientId, {
                                     lineColor: '#333', //线条颜色
                                     width: 2, //线宽

+ 45 - 38
src/main/resources/templates/mz/clinic.html

@@ -2887,61 +2887,68 @@
      style="width:920px;height: calc(100% - 160px);margin:0 auto;border: 1px solid #337ab7;font-size: 13px;padding: 40px 20px 40px 20px;overflow-y: auto; overflow-x:hidden;">
     <div>
         <div>
-            <div style="float: left"><img src="/thmz/images/taihe-logo.png" style="height: 60px;"></div>
-            <div style="text-align:left;font-weight: 700;float: left;height: 60px;line-height: 60px;margin-left: 20px;">
-                门诊指引单
+            <div style="float: left;padding-right: 20px;"><img id="imgcode" style="height: 60px;"/></div>
+            <div style="text-align:left;font-weight: bold;font-size: 23px;float: left;height: 60px;line-height: 60px;margin-left: 20px;">
+                长沙泰和医院诊就诊指引单
             </div>
-            <div style="float: right;padding-right: 20px;"><img id="imgcode" style="height: 60px;"/></div>
-        </div>
+            <div>
+                <div style="float: left;width: 195px;">
+                    <div style="margin-bottom: 10px">门&nbsp;诊&nbsp;号:<span id="patientIdGuideCard"></span></div>
+                    <div style="margin-bottom: 10px">姓&nbsp;&nbsp;名:<span id="patientNameGuideCard"></span></div>
+                    <div style="margin-bottom: 10px">开嘱医生:<span id="doctorGuideCard"></span></div>
+                    <div style="margin-bottom: 10px">开嘱时间:<span id="patientDateGuideCard"></span></div>
+                    <div>单据金额:<span id="totalAmountGuideCard"></span></div>
+                </div>
+                <div  style="float: left;width: 320px;">
+                    <div id="payQrcodeGuideCard" style="float: left;width: 150px;height:150px;text-align: center;padding: 3px">
 
-        <table class="table table-striped table-bordered" style="border-bottom: 1px solid black;font-size: 13px;">
-            <tbody>
-            <tr>
-                <td style="text-align: right">门诊ID:</td>
-                <td id="patientIdGuideCard"></td>
-                <td style="text-align: right">姓名:</td>
-                <td id="patientNameGuideCard"></td>
-                <td style="text-align: right">日期:</td>
-                <td id="patientDateGuideCard"></td>
-            </tr>
+                    </div>
+                    <div id="wxPayQrCard"  style="float: left;width: 150px;height:150px;text-align: center;padding: 3px">
+
+                    </div>
+                </div>
+            </div>
+        </div>
+        <table class="table table-striped table-bordered" style="border-top: 2px dashed black">
+            <tbody >
+                <tr>
+                    <td colspan="3">
+                        <span style="font-weight: 700;"> 1、项目指引:</span>
+                    </td>
+                </tr>
             </tbody>
         </table>
-        <table class="table table-striped table-bordered" style="border-bottom: 1px solid black">
+        <table class="table table-striped table-bordered" style="border: 1px dashed black">
             <tbody id="guideCardDetail" style="padding-bottom: 10px;font-size: 13px;">
             </tbody>
         </table>
         <table class="table table-striped table-bordered" style="font-size: 13px;margin-top: 10px;">
             <tbody>
-<!--            <tr>-->
-<!--                <td style="font-weight: 700">自付金额:<span id="selfAmountGuideCard"></span><span>元</span></td>-->
-<!--                <td style="font-weight: 700">门诊统筹:<span id="fundPayGuideCard"></span><span>元</span></td>-->
-<!--            </tr>-->
-            <tr>
-<!--                <td style="font-weight: 700">个账支付:<span id="acctPayGuideCard"></span><span>元</span></td>-->
-                <td colspan="2" style="font-weight: 700">合计金额:<span id="totalAmountGuideCard"></span><span>元</span></td>
-            </tr>
-            <tr>
-                <td colspan="2">医保门诊统筹报销跨月不可以退费,退费必须在就诊当月完成,请悉知。</td>
-            </tr>
-            <tr>
-                <td colspan="2">如有故障请联系服务中心:0731-88518702</td>
-            </tr>
             <tr>
-                <td colspan="2">请缴费后至以上科室取药或检查治疗,检查完成后可关注服务号查询结果。</td>
-            </tr>
-            <tr>
-                <td colspan="2">急诊科加急检验,请于急诊导诊台抽血。</td>
+                <td colspan="3">
+                    <span style="font-weight: 700;"> 2、缴费告知:</span>
+                     推荐使用扫码支付,也可在门诊收费窗口缴费;如有职工医保,可门诊统筹支付,已统筹处方因医保限制跨月不可退费。
+                </td>
             </tr>
             <tr>
-                <td colspan="2">急诊科B超,8:00-17:30请前往五楼超声影影像科检查,其他时间在急诊科B超室。</td>
+                <td colspan="3">
+                    <span style="font-weight: 700;"> 3、预约与查询:</span>
+                    检查检验结果推荐在手机公众号查看,如需纸质版结果,抽血检验结果可至自助打印机和看诊楼层导诊处打印,超声结果在【超声科】前台打印,放射科结果在【放射科】前台打印。
+                </td>
             </tr>
             </tbody>
         </table>
         <div>
-        <div id="payQrcodeGuideCard" style="width: 300px;height: 100px;margin-top:10px;float: left;text-align: center"></div>
-        <div id="healthEducationCard" style="width: 100px;height: 100px;margin-top:10px;float: right;margin-right: 100px;"></div>
+            <div style="font-weight: 800;margin-top: 5px;">
+                <div style="width: 480px;text-align: center;margin-bottom: 5px;">365 天无假日医院</div>
+                <div style="width: 480px;text-align: center;margin-bottom: 5px;">如果您满意,请告诉别人;如果您不满意,请告诉我们</div>
+                <div style="width: 480px;text-align: center;margin-bottom: 5px;"> 24小时帮助/投诉电话:88518888</div>
+            </div>
+            <div >
+                <img src="/thmz/images/zydfooter.png" style="height: 70px;width: 480px"/>
+            </div>
+
         </div>
-        <div id="wxPayQrCard" style="text-align: center;margin-top: 150px;"></div>
     </div>
 </div>
 <!--打印门诊指引单结束-->