代码修改

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -872,7 +872,7 @@ public class ConsultTeamService extends ConsultService {
     * @param reason
     * @return
     */
    public Integer addPrescriptionConsult(String jwCode,String patient,String agent,String doctorCode,ConsultTeam ct,String reason) throws Exception {
    public Integer addPrescriptionConsult(String jwCode,String patient,String agent,String doctorCode,ConsultTeam ct,String reason,Integer type) throws Exception {
        synchronized (jwCode.intern()){
            List<Prescription> prescriptionList = prescriptionDao.fingdByJwCodeAndStatus(jwCode,0);
@@ -885,7 +885,7 @@ public class ConsultTeamService extends ConsultService {
            //1、获取基位处方详情（保存续方表、药品续方信息表、续方疾病类型表）
            Prescription prescription = new Prescription();
            String symptoms = savePrescription(prescription,jwCode,doctor,p,ct,reason);
            savePrescription(prescription,jwCode,doctor,p,ct,reason);
            JSONObject jsonObject = new JSONObject();
            jsonObject.put("title",p.getName()+"申请续方");
@@ -916,7 +916,7 @@ public class ConsultTeamService extends ConsultService {
            ct.setDoctorName(doctor.getName());
            // 设置患者信息
            ct.setPatient(patient);
            ct.setSymptoms(symptoms);
            ct.setSymptoms(type==1?"高血压":"糖尿病");
            // 设置患者姓名
            ct.setName(p.getName());
            // 设置患者生日

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/consult/DoctorConsultController.java

@@ -759,6 +759,19 @@ public class DoctorConsultController extends WeixinBaseController {
        }
    }
    @ApiOperation("咨询是否结束")
    @RequestMapping(value = "/getConsultStatus",method = RequestMethod.GET)
    @ResponseBody
    public String getConsultStatus(@RequestParam(required = true) String consult){
        try {
            ConsultTeam consultTeam =  consultTeamService.findByConsultCode(consult);
            return write(200, "查询成功", "data", consultTeam.getStatus());
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1, "查询失败");
        }
    }
    /**
     * 查询与某个医生是否存在未结束的咨询
@@ -1103,7 +1116,7 @@ public class DoctorConsultController 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));//续方药品信息
            //服务类型
@@ -1118,6 +1131,7 @@ public class DoctorConsultController extends WeixinBaseController {
                }
            }
            json.put("signFamilyServer",jsonArray);
            json.put("symptoms",consult1.getSymptoms());//咨询类型--- 1高血压，2糖尿病
            return write(200, "查询成功！", "list", json);
        }catch (Exception e){