|
|
@ -90,6 +90,7 @@ public class ConsultController extends WeixinBaseController {
|
|
|
@Autowired
|
|
|
private ConsultDao consultDao;
|
|
|
|
|
|
|
|
|
/**
|
|
|
* 患者咨询记录查询
|
|
|
*
|
|
|
@ -976,6 +977,8 @@ public class ConsultController extends WeixinBaseController {
|
|
|
@RequestParam(value = "jwCode", required = true) String jwCode,
|
|
|
@ApiParam(name = "doctor", value = "咨询医生（开方医生、审核医生）", defaultValue = "86225d1365e711e69f7c005056850d66")
|
|
|
@RequestParam(value = "doctor", required = true) String doctor,
|
|
|
@ApiParam(name = "type", value = "咨询类型（1、高血压-续方咨询；2、糖尿病-续方咨询）", defaultValue = "1")
|
|
|
@RequestParam(value = "type", required = true) Integer type,
|
|
|
@ApiParam(name = "adminTeamId", value = "签约行政团队id", defaultValue = "224")
|
|
|
@RequestParam(value = "adminTeamId", required = true) Long adminTeamId,
|
|
|
@ApiParam(name = "reason", value = "续方说明", defaultValue = "续方申请")
|
|
|
@ -986,7 +989,7 @@ public class ConsultController extends WeixinBaseController {
|
|
|
consult.setAdminTeamId(adminTeamId);
|
|
|
// 保存到数据库
|
|
|
// int res = consultTeamService.addPrescriptionConsult(jwCode, "a663d0cf7f8c4d38a8327cedc921e65f","a663d0cf7f8c4d38a8327cedc921e65f",doctor,consult,reason);
|
|
|
int res = consultTeamService.addPrescriptionConsult(jwCode, getRepUID(),getUID(),doctor,consult,reason);
|
|
|
int res = consultTeamService.addPrescriptionConsult(jwCode, getRepUID(),getUID(),doctor,consult,reason,type);
|
|
|
if (res == -1) {
|
|
|
return error(-1, "该处方存在未审核的续方，无法进行续方咨询！");
|
|
|
}
|
|
|
@ -1068,8 +1071,9 @@ public class ConsultController extends WeixinBaseController {
|
|
|
String prescriptionCode = consult1.getRelationCode();
|
|
|
Prescription prescription = prescriptionDao.findByCode(prescriptionCode);
|
|
|
json.put("status",prescription.getStatus());//状态 (-1 审核不通过 , 0 审核中, 10 审核通过/待支付 ,21支付失败 20 配药中/支付成功, 21 等待领药 ,30 配送中 ,100配送成功/已完成)
|
|
|
json.put("prescriptionDt",prescriptionDiagnosisService.getPrescriptionDiagnosis(prescriptionCode));//续方疾病类型
|
|
|
// json.put("prescriptionDt",prescriptionDiagnosisService.getPrescriptionDiagnosis(prescriptionCode));//续方疾病类型
|
|
|
json.put("prescriptionInfo",prescriptionDiagnosisService.getPrescriptionInfo(prescriptionCode));//续方药品信息
|
|
|
json.put("symptoms",consult1.getSymptoms());//咨询类型--- 1高血压，2糖尿病
|
|
|
|
|
|
return write(200, "查询成功！", "list", json);
|
|
|
}catch (Exception e){
|
