第三医院版本开发

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

@@ -1907,7 +1907,7 @@ public class DsyyEntranceService {
        if (StringUtils.isNoneBlank(hismzlsh)){
            object.put("hismzlsh",hismzlsh);
        }
//        object.put("trade_type","5");
        object.put("trade_type","5");
        object.put("accountType","01");
        object.put("sfxsjs","Y");
        condition = object.toJSONString();
@@ -2854,12 +2854,12 @@ public class DsyyEntranceService {
                "<CREATE_USER_ID>"+doctorMappingDO.getMappingCode()+"</CREATE_USER_ID>" +
                "<CREATE_USER_NAME>"+prescriptionDO.getDoctorName()+"</CREATE_USER_NAME>" +
                "<CREATE_DATE_TIME>"+DateUtil.dateToStrLong(prescriptionDO.getCreateTime())+"</CREATE_DATE_TIME>" +
                "<MR_CODE>EMR10.00.18_36</MR_CODE>" +
                "<MR_CODE>EMR02.00.01_1588</MR_CODE>" +
                "<TOPIC>互联网医院专用</TOPIC>" +
                "<HOSPITAL_NO>42661889-5</HOSPITAL_NO>" +
                "<DEPT_CODE>"+prescriptionDO.getDept()+"</DEPT_CODE>" +
                "<DEPT_NAME>"+prescriptionDO.getDeptName()+"</DEPT_NAME>" +
                "<FILE_FLAG>1</FILE_FLAG>" +
                "<FILE_FLAG>C</FILE_FLAG>" +
                "<SHCZZT_FLAG>"+doctorMappingDO.getMappingCode()+"</SHCZZT_FLAG>" +
                "<CA_SIGN_PIC>"+stamp+"</CA_SIGN_PIC>" +
                "<Structured_medical>" +
@@ -3032,14 +3032,14 @@ public class DsyyEntranceService {
        }
        String condition = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" +
                "  <MESSAGE>\n" +
                "    <PATIENT_ID>"+patientMappingDO.getMappingCode()+"</PATIENT_ID>\n" +
                "    <PATIENT_ID>"+patientMappingDO.getMappingCode()+"1</PATIENT_ID>\n" +
                "    <VISIT_ID>"+visitId+"</VISIT_ID>\n" +
                "    <NAME>"+outpatientDO.getPatientName()+"</NAME>\n" +
                "    <NAME_PHONETIC>CS</NAME_PHONETIC>\n" +
                "    <NAME_PHONETIC></NAME_PHONETIC>\n" +
                "    <SEX>"+sexName+"</SEX>\n" +
                "    <ID_NO>"+patientDO.getIdcard()+"</ID_NO>\n" +
                "    <CITIZENSHIP>中国</CITIZENSHIP>\n" +
                "    <DATE_OF_BIRTH>"+patientDO.getBirthday()+"</DATE_OF_BIRTH>\n" +
                "    <DATE_OF_BIRTH>"+DateUtil.dateToStrShort(patientDO.getBirthday())+"</DATE_OF_BIRTH>\n" +
                "    <CARD_NO>"+outpatientDO.getCardNo()+"</CARD_NO>\n" +
                "    <CREATE_DATE></CREATE_DATE>\n" +
                "    <AGE>"+DateUtil.getAgeForIdcard(patientDO.getIdcard())+"岁</AGE>\n" +
@@ -3123,14 +3123,14 @@ public class DsyyEntranceService {
                "    <CREATE_USER_ID>"+doctorMappingDO.getMappingCode()+"</CREATE_USER_ID>\n" +
                "    <CREATE_USER_NAME>"+prescriptionDO.getDoctorName()+"</CREATE_USER_NAME>\n" +
                "    <CREATE_DATE_TIME>"+DateUtil.dateToStrLong(prescriptionDO.getCreateTime())+"</CREATE_DATE_TIME>\n" +
                "    <MR_CODE>EMR10.00.18_36</MR_CODE>\n" +
                "    <MR_CODE>EMR02.00.01_1588</MR_CODE>\n" +
                "    <TOPIC>互联网医院专用</TOPIC>\n" +
                "    <HOSPITAL_NO>42661889-5</HOSPITAL_NO>\n" +
                "    <DEPT_CODE>"+prescriptionDO.getDept()+"</DEPT_CODE>\n" +
                "    <DEPT_NAME>"+prescriptionDO.getDeptName()+"</DEPT_NAME>\n" +
                "    <FILE_FLAG>1</FILE_FLAG>\n" +
                "    <FILE_FLAG>C</FILE_FLAG>\n" +
                "    <SHCZZT_FLAG>"+doctorMappingDO.getMappingCode()+"</SHCZZT_FLAG>\n" +
                "    <CA_SIGN_PIC></CA_SIGN_PIC>\n" +
                "    <CA_SIGN_PIC>"+stamp+"</CA_SIGN_PIC>\n" +
                "    <Structured_medical>\n" +
                "      <主诉>"+prescriptionEmrDO.getComplaint()+"</主诉>\n" +
                "      <流行病学史>"+prescriptionEmrDO.getPopularHistory()+"</流行病学史>\n" +

business/base-service/src/main/java/com/yihu/jw/order/BusinessOrderService.java

@@ -1476,7 +1476,9 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                    }else if (businessOrderDO!=null&&businessOrderDO.getOrderCategory().equalsIgnoreCase("6")){
                        YlzMedicalRelationDO ylzMedicalRelationDO = ylzMedicailRelationDao.findById(businessOrderDO.getRelationCode()).get();
                        if (wechatId.equalsIgnoreCase("xm_dsyy_wx")){
                            dsyyPrescriptionService.confirmSettlement(ylzMedicalRelationDO.getRelationCode());
                            if (businessOrderDO.getStatus()!=1){
                                dsyyPrescriptionService.confirmSettlement(ylzMedicalRelationDO.getRelationCode());
                            }
                        }
                    }
                }

business/base-service/src/main/java/com/yihu/jw/wlyy/service/WlyyBusinessService.java

@@ -20,7 +20,9 @@ import com.yihu.jw.entity.specialist.rehabilitation.RehabilitationPatientInfoDO;
import com.yihu.jw.hospital.httplog.service.BaseOperateLogService;
import com.yihu.jw.hospital.mapping.dao.DoctorMappingDao;
import com.yihu.jw.hospital.prescription.dao.OutpatientDao;
import com.yihu.jw.hospital.prescription.service.DsyyPrescriptionService;
import com.yihu.jw.hospital.prescription.service.PrescriptionService;
import com.yihu.jw.hospital.prescription.service.entrance.DsyyEntranceService;
import com.yihu.jw.hospital.prescription.service.entrance.XzzxEntranceService;
import com.yihu.jw.org.dao.BaseOrgDao;
import com.yihu.jw.patient.dao.BasePatientDao;
@@ -89,6 +91,8 @@ public class WlyyBusinessService {
    private XzzxEntranceService xzzxEntranceService;
    @Autowired
    private BaseOperateLogService baseOperateLogService;
    @Autowired
    private DsyyPrescriptionService dsyyPrescriptionService;
    /**
@@ -282,7 +286,7 @@ public class WlyyBusinessService {
        
        String idcard = "";
        String result = "";
        BasePatientDO basePatientDO = basePatientDao.findById(patientId).orElse(null);
        BasePatientDO basePatientDO = basePatientDao.findById(patientId).get();
        if(basePatientDO != null){
            idcard = basePatientDO.getIdcard();