|
|
@ -260,7 +260,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
|
|
|
|
|
|
try {
|
|
|
WlyyOutpatientVO obj = new WlyyOutpatientVO();
|
|
|
if (wxId.equalsIgnoreCase("xm_zsyy_wx")) {
|
|
|
if (wxId.equalsIgnoreCase("xm_zsyy_wx")||demoFlag) {
|
|
|
obj = prescriptionService.findOutpatientInfo(patient, conNo);
|
|
|
} else if (wxId.equalsIgnoreCase("sd_tnzyy_wx")) {
|
|
|
obj = tnPrescriptionService.findOutpatientInfo(patient, conNo, demoFlag, null);
|
|
|
@ -363,13 +363,15 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
|
|
|
@RequestParam(value = "endTime", required = false) String endTime,
|
|
|
@ApiParam(name = "outpatientType", value = "1复诊2协同3咨询4康复咨询")
|
|
|
@RequestParam(value = "outpatientType", required = false) String outpatientType,
|
|
|
@ApiParam(name = "type", value = "outpatientType=1时 type 1=住院申请")
|
|
|
@RequestParam(value = "type", required = false) String type,
|
|
|
@ApiParam(name = "page", value = "第几页，1开始’")
|
|
|
@RequestParam(value = "page", required = false) Integer page,
|
|
|
@ApiParam(name = "size", value = "每页大小")
|
|
|
@RequestParam(value = "size", required = true) Integer size) {
|
|
|
|
|
|
try {
|
|
|
return prescriptionService.findReOutpatientList(patient, status, startTime, endTime, outpatientType, page, size);
|
|
|
return prescriptionService.findReOutpatientList(patient, status, startTime, endTime, outpatientType, page, size,type);
|
|
|
} catch (Exception e) {
|
|
|
return failedMixEnvelopException(e);
|
|
|
}
|
|
|
@ -640,7 +642,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
|
|
|
@ApiOperation(value = "获取ICD10诊断编码", notes = "获取ICD10诊断编码")
|
|
|
public ListEnvelop getICD10(@ApiParam(name = "pyKey", value = "拼音关键字")
|
|
|
@RequestParam(value = "pyKey", required = false) String pyKey) throws Exception {
|
|
|
if (wxId.equalsIgnoreCase("xm_zsyy_wx")) {
|
|
|
if (wxId.equalsIgnoreCase("xm_zsyy_wx")||demoFlag) {
|
|
|
return success(prescriptionService.getICD10(pyKey));
|
|
|
} else if (wxId.equalsIgnoreCase("xm_xzzx_wx")) {
|
|
|
return success(xzzxEntranceService.selectIcd10Dict(pyKey));
|
|
|
@ -3794,16 +3796,28 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
|
|
|
@PostMapping("/applyHospital")
|
|
|
@ApiOperation(value = "住院登记申请", notes = "住院登记申请")
|
|
|
public Envelop applyHospital(
|
|
|
@ApiParam(name = "json", value = "住院登记实体类json", required = false)
|
|
|
@RequestParam(value = "json",required = false)String json) {
|
|
|
@ApiParam(name = "json", value = "住院登记实体类json", required = true)
|
|
|
@RequestParam(value = "json",required = true)String json,
|
|
|
@ApiParam(name = "session_id", value = "会话id", required = true)
|
|
|
@RequestParam(value = "session_id",required = true)String session_id) {
|
|
|
try {
|
|
|
WlyyOutpatientHospitalizationDO hospitalizationDO = toEntity(json,WlyyOutpatientHospitalizationDO.class);
|
|
|
return success("操作成功", prescriptionService.applyHospital(hospitalizationDO));
|
|
|
hospitalizationDO = prescriptionService.applyHospital(hospitalizationDO);
|
|
|
//发送im
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
jsonObject.put("id",hospitalizationDO.getId());
|
|
|
jsonObject.put("outpatientId",hospitalizationDO.getOutpatientId());//复诊id
|
|
|
jsonObject.put("diagnosisCode",hospitalizationDO.getDiagnosisCode());//诊断代码
|
|
|
jsonObject.put("diagnosisName",hospitalizationDO.getDiagnosisName());//诊断名称
|
|
|
jsonObject.put("admissionCondition",hospitalizationDO.getAdmissionCondition());//入院病情
|
|
|
imUtil.sendImMsg(hospitalizationDO.getDoctor(), hospitalizationDO.getDoctorName(), session_id, "50", jsonObject.toString(), "1", null);
|
|
|
return success("操作成功",hospitalizationDO);
|
|
|
} catch (Exception e) {
|
|
|
return Envelop.getError(e.getMessage());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
@PostMapping("/selectHospitalizationByOutpatientId")
|
|
|
@ApiOperation(value = "查询申请记录", notes = "查询申请记录")
|
|
|
public Envelop selectHospitalizationByOutpatientId(
|
wangzhinan