Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/wechat/WechatMenuController.java

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

@@ -867,8 +867,16 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            outpatientDO.setPayStatus(0);
        }
        if (outpatient.getOutpatientType().equalsIgnoreCase("1")){
            if (outpatient.getType().equalsIgnoreCase("1")){
                businessOrderService.recharge(outpatient.getId(), "图文复诊-诊查费", "2", "图文复诊-诊查费", outpatient.getConsumer(), outpatient.getConsumerName(), outpatient.getDoctor(), price);
            }else if (outpatient.getType().equalsIgnoreCase("2")){
                businessOrderService.recharge(outpatient.getId(), "视频复诊-诊查费", "3", "视频复诊-诊查费", outpatient.getConsumer(), outpatient.getConsumerName(), outpatient.getDoctor(), price);
            }
        }else if (outpatient.getOutpatientType().equalsIgnoreCase("2")){
            businessOrderService.recharge(outpatient.getId(), "协同复诊-诊查费", "5", "协同复诊-诊查费", outpatient.getConsumer(), outpatient.getConsumerName(), outpatient.getDoctor(), price);
        }
        BusinessOrderDO businessOrderDO = businessOrderService.recharge(outpatient.getId(), "复诊-诊查费", "2", "复诊-诊查费", outpatient.getConsumer(), outpatient.getConsumerName(), outpatient.getDoctor(), price);
        WlyyPatientRegisterTimeDO registerTimeDO = null;
        WlyyPatientRegisterTimeDO wlyyPatientRegisterTimeDO =new WlyyPatientRegisterTimeDO();
@@ -9076,4 +9084,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        }
        return null;
    }
}

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

@@ -364,6 +364,7 @@ public class XzzxEntranceService{
                                    hospitalDO.setOrgName("厦门大学附属心血管病医院");
                                    hospitalDO.setDeptCode(doctorJson.getString("dept"));
                                    hospitalDO.setDeptName(doctorJson.getString("deptName"));
                                    hospitalDO.setDel("1");
                                    doctorHospitalDao.save(hospitalDO);
                                }
                            }
@@ -383,6 +384,21 @@ public class XzzxEntranceService{
                                doctorMappingDO.setMappingJobName(doctorJson.getString("jobTitleName"));
                                doctorMappingDO.setCreateTime(new Date());
                                doctorMappingDao.save(doctorMappingDO);
                            }else{
                                DoctorMappingDO doctorMappingDO = new DoctorMappingDO();
                                doctorMappingDO.setIdcard(idcard);
                                doctorMappingDO.setDoctor(doctor.getId());
                                doctorMappingDO.setOrgCode("350211A5010");
                                doctorMappingDO.setOrgName("厦门大学附属心血管病医院");
                                doctorMappingDO.setMappingCode(doctorJson.getString("code"));
                                doctorMappingDO.setMappingName(doctorJson.getString("name"));
                                doctorMappingDO.setDoctorName(doctor.getName());
                                doctorMappingDO.setMappingDeptName(doctorJson.getString("deptName"));
                                doctorMappingDO.setMappingDept(doctorJson.getString("dept"));
                                doctorMappingDO.setMappingJob(doctorJson.getString("jobTitleCode"));
                                doctorMappingDO.setMappingJobName(doctorJson.getString("jobTitleName"));
                                doctorMappingDO.setCreateTime(new Date());
                                doctorMappingDao.save(doctorMappingDO);
                            }
                        } else {

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

@@ -15,9 +15,9 @@ import com.yihu.jw.entity.base.area.BaseProvinceDO;
import com.yihu.jw.entity.base.area.BaseTownDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.im.ConsultDo;
import com.yihu.jw.entity.base.im.ConsultTeamDo;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.entity.hospital.prescription.*;
import com.yihu.jw.entity.order.BusinessOrderDO;
import com.yihu.jw.hospital.mapping.service.PatientMappingService;
import com.yihu.jw.hospital.prescription.dao.OutpatientDao;
import com.yihu.jw.hospital.prescription.dao.PrescriptionDiagnosisDao;
@@ -30,7 +30,6 @@ import com.yihu.jw.hospital.prescription.service.entrance.DoctorPreSignService;
import com.yihu.jw.hospital.prescription.service.entrance.XzzxEntranceService;
import com.yihu.jw.hospital.service.SystemMessage.HospitalSystemMessageService;
import com.yihu.jw.im.dao.ConsultDao;
import com.yihu.jw.im.dao.ConsultTeamDao;
import com.yihu.jw.im.service.ImService;
import com.yihu.jw.order.BusinessOrderService;
import com.yihu.jw.restmodel.base.area.BaseCityVO;
@@ -84,9 +83,6 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private DoctorPreSignService doctorPreSignService;
    
    @Autowired
    private HospitalSystemMessageService hospitalSystemMessageService;
    
    @Autowired
    private WorkTimeService workTimeService;
    
@@ -120,7 +116,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private ConsultDao consultDao;
    @Autowired
    private ConsultTeamDao consultTeamDao;
    private HospitalSystemMessageService hospitalSystemMessageService;
    @Value("${demo.flag}")
    private boolean demoFlag;
@@ -2094,7 +2090,23 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "relationCode", value = "业务code")
            @RequestParam(value = "relationCode", required = false) String relationCode) throws Exception {
        try {
            return ObjEnvelop.getSuccess("ok",businessOrderService.updatePayStatusByRelation(relationCode));
            BusinessOrderDO businessOrderDO = businessOrderService.updatePayStatusByRelation(relationCode);
            if (businessOrderDO.getOrderCategory().equalsIgnoreCase("2")){
                SystemMessageDO systemMessageDO = new SystemMessageDO();
                systemMessageDO.setType("1");
                systemMessageDO.setReceiver(businessOrderDO.getDoctor());
                systemMessageDO.setSender(businessOrderDO.getPatient());
                //发送IM消息
                hospitalSystemMessageService.sendImMessage(systemMessageDO);
            }else if (businessOrderDO.getOrderCategory().equalsIgnoreCase("3")){
                SystemMessageDO systemMessageDO = new SystemMessageDO();
                systemMessageDO.setType("2");
                systemMessageDO.setReceiver(businessOrderDO.getDoctor());
                systemMessageDO.setSender(businessOrderDO.getPatient());
                //发送IM消息
                hospitalSystemMessageService.sendImMessage(systemMessageDO);
            }
            return ObjEnvelop.getSuccess("ok",businessOrderDO);
        } catch (Exception e) {
            return ObjEnvelop.getError(e.getMessage());
        }