Merge branch 'dev' of wangjun/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/XzzxEntranceService.java

@@ -1358,6 +1358,7 @@ public class XzzxEntranceService{
                "</Diagnosises>\n";
        StringBuffer stringBuffer = new StringBuffer();
        for (WlyyPrescriptionInfoDO wlyyPrescriptionInfoDO:infos){
            int i = 1;
            stringBuffer.append("<Advice REPEAT=\"1\" DRUG_LO_NAME=\""+wlyyPrescriptionInfoDO.getDrugName()+
                    "\" DRUG_LO_ID=\""+wlyyPrescriptionInfoDO.getHisCode()+
                    "\" ADMINISTRATION=\""+wlyyPrescriptionInfoDO.getSupplyName()+
@@ -1366,8 +1367,8 @@ public class XzzxEntranceService{
                    "\" FREQ_COUNT=\""+wlyyPrescriptionInfoDO.getUsageCode()+
                    "\" FREQ_INTERVAL=\"\" FREQ_INTERVAL_UNIT=\"\" START_DAY=\""+patientAndDoctor.getString("CREATE_DATE")+"\" END_DAY=\"\" DEPT_CODE=\""+patientAndDoctor.getString("DEPT_CODE")+
                    "\" DOCTOR_NAME=\""+patientAndDoctor.getString("DOCTOR_NAME")+
                    "\" ORDER_NO=\""+patientAndDoctor.getString("PATIENT_PRES_ID")+
                    "\" ORDER_SUB_NO=\""+patientAndDoctor.getString("PATIENT_PRES_ID")+"\" AUTHORITY_LEVELS=\"\" ALERT_LEVELS=\"\" TITLE=\""+patientAndDoctor.getString("POSITION") +
                    "\" ORDER_NO=\""+i+
                    "\" ORDER_SUB_NO=\""+1+"\" AUTHORITY_LEVELS=\"\" ALERT_LEVELS=\"\" TITLE=\""+patientAndDoctor.getString("POSITION") +
                    "\" GROUP_ID=\""+wlyyPrescriptionInfoDO.getFrequency()+"\" USER_ID=\""+patientAndDoctor.getString("doctorId")+
                    "\" PRES_ID=\""+patientAndDoctor.getString("PATIENT_PRES_ID")+
                    "\" PRES_DATE=\""+patientAndDoctor.getString("CREATE_DATE")+
@@ -1377,6 +1378,7 @@ public class XzzxEntranceService{
                    "\" PKG_UNIT=\""+wlyyPrescriptionInfoDO.getPackUnitName()+"\" BAK_01=\"\" BAK_02=\"\" BAK_03=\""+wlyyPrescriptionInfoDO.getUnitName()+
                    "\" BAK_04=\""+wlyyPrescriptionInfoDO.getSpecification()+
                    "\" BAK_05=\""+wlyyPrescriptionInfoDO.getDrugPlace()+"\"  />");
            i++;
        }
        String checkInfos = "<Advices>"+stringBuffer.toString()+"</Advices>";
        String postBody = "<CheckInput TAG=\"2\" INPATIENT=\"否\">"+checkDoctor+checkPatient+checkDiagnosises+checkInfos+"</CheckInput>";
@@ -2934,6 +2936,9 @@ public Map checkSyncHis(String IoFlag,String PayCardNo,String NullahNumber,Strin
                System.out.println("obj:"+obj);
                if (StringUtils.isNotBlank(obj)) {
                    List<Map<String,Object>> returnList = transXmlCommen(obj);
                    Map<String,Object> checkIdMap = new HashMap<>();
                    checkIdMap.put("prescriptionOnly",tjPrescriptionId);
                    returnList.add(checkIdMap);
                    returnJson = JSONArray.toJSONString(returnList);
                    logger.info("返回到互联网医院的解析后的结果："+returnJson);
                    wlyyHttpLogDO.setDoctor(doctor);

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -2089,11 +2089,11 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        return success(xzzxEntranceService.selectLisApply(spellCode));
    }
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.xzzxCheckInfo)
    @PostMapping(value = BaseHospitalRequestMapping.Prescription.xzzxCheckInfo)
    @ApiOperation(value = "合理用药审核接口")
    public Envelop xzzxCheckInfo(
            @ApiParam(name = "prescriptionId", value = "处方唯一标识")
            @RequestParam(value = "prescriptionId",defaultValue = "") String prescriptionOnly,
            @ApiParam(name = "prescriptionOnly", value = "处方唯一标识")
            @RequestParam(value = "prescriptionOnly",defaultValue = "") String prescriptionOnly,
            @ApiParam(name = "payType", value = "付款方式0自费；1医保")
            @RequestParam(value = "payType",defaultValue = "") String payType,
            @ApiParam(name = "doctor", value = "医生id")