Browse Source

代码修改

LAPTOP-KB9HII50\70708 1 year ago
parent
commit
c73dac9006

+ 1 - 2
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/PatientConsultEndpoint.java

@ -471,13 +471,12 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
		consult.setVoice(voice);
		consult.setDoctor(doctor);
		consult.setPatient(patient);
		consult.setRelationCode(relationCode);
		// 保存到数据库
//		int res = 0;
//		JSONArray dts = null;
		synchronized (patient.intern()){//新增同步方法。设备保存写在service层但是不生效,写在controller层才生效
			JSONObject re = null;
			re = imService.addTeamConsult(consult, patient,doctor,source);
			re = imService.addTeamConsult(consult, patient,doctor,source,relationCode);
//			res = re.getInteger("status");
//			dts = re.containsKey("doctor")?re.getJSONArray("doctor"):null;
			if (payFlag){

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

@ -240,7 +240,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
            } else if (wxId.equalsIgnoreCase("xm_hcyy_wx")) {
                vos = hcyyPrescriptionService.selectOutpatientList(patient,startTime,endTime,cardNo);
            } else if (wxId.equalsIgnoreCase("xm_dsyy_wx")) {
                vos = dsyyPrescriptionService.selectOutpatientList(patient, startTime, endTime, ksdm, cardNo);
                vos = dsyyPrescriptionService.selectOutpatientList(patient, startTime, endTime,demoFlag, ksdm, cardNo);
            } else {
                return ListEnvelop.getError("尚未开发!");
            }
@ -463,7 +463,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                                      @RequestParam(value = "patient", required = true) String patient,
                                      @ApiParam(name = "flag", value = "标识是否开启结算")
                                      @RequestParam(value = "flag", required = false) boolean flag,
                                      @ApiParam(name = "outpatientType", value = "1在线复诊 2 协同 3 专家咨询")
                                      @ApiParam(name = "outpatientType", value = "1在线复诊 2 协同 3 专家咨询 4康复咨询")
                                      @RequestParam(value = "outpatientType", required = false) String outpatientType) throws Exception {
        try {