发票及线上预约

src/main/java/cn/hnthyy/thmz/controller/api/MedicalViewApiController.java

@@ -914,6 +914,7 @@ public class MedicalViewApiController {
         if(dictDataService.queryFpVersion() == 1){
             MzReceiptSerial mzReceiptSerial = new MzReceiptSerial(mzDzfpUpload.getPatientId(), mzDzfpUpload.getTimes());
             mzReceiptSerial.setReceiptNo(mzDzfpUpload.getReceiptNo());
+            mzReceiptSerial.setOperatorId(mzDzfpUpload.getOpId());
             dictDataService.getBswServer().asnyMzInvoice(mzReceiptSerial,ghFlag,mzDzfpUpload.getTypeFlag());
         }
     }
@@ -2408,6 +2409,7 @@ public class MedicalViewApiController {
             int num = mzyReqrecService.saveMzyReqrec(mzyReqrecPageDto, whiteList.getOpId());
             requestDzfp(MzDzfpUpload.builder()
                     .patientId(mzyReqrecPageDto.getMzyReqrec().getPatientId())
+                    .opId("HH667")
                     .times(num)
                     .typeFlag(1)
                     .receiptNo(0)

src/main/java/cn/hnthyy/thmz/entity/mzdzfp/JSMzInvoiceInfo.java

@@ -173,13 +173,15 @@ public class JSMzInvoiceInfo implements Serializable {
         bizinfo.setMedcare_type_code(mzInvoiceInfo.getSpecialAttrDTO().getInsureTypeCode());
         bizinfo.setPatient_id(mzInvoiceInfo.getSpecialAttrDTO().getOutpatientNo());
         bizinfo.setSex(mzInvoiceInfo.getSpecialAttrDTO().getSex());
-        bizinfo.setMed_inst_type("");
+        bizinfo.setMed_inst_type("二级医院");
         bizinfo.setAge(mzInvoiceInfo.getSpecialAttrDTO().getAge());
         bizinfo.setBiztype(biztype);
         //医疗业务病人信息(住院)
         if ("01".equals(biztype)) {
             MedBedinfo medBedinfo = new MedBedinfo();
             medBedinfo.setHospital_no(mzInvoiceInfo.getSpecialAttrDTO().getOutpatientNo());
+            medBedinfo.setIn_category(mzInvoiceInfo.getSpecialAttrDTO().getHospitalDepartment());
+            medBedinfo.setOut_category(mzInvoiceInfo.getSpecialAttrDTO().getHospitalDepartment());
 //        medOutinfo.setCase_no("");
             bizinfo.setMed_bedinfo(medBedinfo);
             jsMzInvoiceInfo.setInvoice_type_code("320602");
@@ -282,5 +284,7 @@ class MedOutinfo {
 @Data
 class MedBedinfo {
     private String hospital_no;	//	患者住院号
+    private String in_category;	//	患者住院号
+    private String out_category;	//	患者住院号
 }