Merge branch 'dev' of yeshijie/patient-co-management into dev

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

@@ -884,6 +884,11 @@ public class ConsultTeamService extends ConsultService {
            if("0".equals(check)){//存在未审核的续方
                return -1;
            }
            SignFamily signFamily = signFamilyDao.findByPatient(patient);
            if(signFamily==null){
                return -2;
            }
            Doctor doctor = doctorDao.findByCode(doctorCode);
            // 查询患者信息
            Patient p = patientDao.findByCode(patient);
@@ -896,8 +901,8 @@ public class ConsultTeamService extends ConsultService {
            jsonObject.put("title",p.getName()+"申请续方");
            //2、获取体征记录
            Iterable<PatientDevice> devices = patientDeviceDao.findByUser(patient);
            if(devices!=null||devices.iterator().hasNext()){
            List<PatientDevice> devices = patientDeviceDao.findByPatient(patient);
            if(devices!=null&&devices.size()>0){
                int count = messageDao.findTzMessage(patient);
                jsonObject.put("tzMsg","最近七天有"+count+"条异常记录");
            }else{
@@ -1022,7 +1027,8 @@ public class ConsultTeamService extends ConsultService {
    public String savePrescription(Prescription prescription,String jwCode,Doctor doctor,Patient p,ConsultTeam ct,String reason) throws Exception{
        String re = "";
        //获取智业处方详细
//        String response = jwPrescriptionService.getLastRecipe(p.getSsc(),jwCode,null,null);
//        String response = jwPrescriptionService.getRecipe(jwCode,p.getSsc());
//        JSONObject jsonObject =
        //续方主表
        prescription.setCode(getCode());

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

@@ -1007,10 +1007,12 @@ public class ConsultController extends WeixinBaseController {
            consult.setType(8);//续方咨询
            consult.setAdminTeamId(adminTeamId);
            // 保存到数据库
//            int res = consultTeamService.addPrescriptionConsult(jwCode, "a663d0cf7f8c4d38a8327cedc921e65f","a663d0cf7f8c4d38a8327cedc921e65f",doctor,consult,reason);
//            int res = consultTeamService.addPrescriptionConsult(jwCode, "37c0657335f94ed38eeced22dbed8011","37c0657335f94ed38eeced22dbed8011",doctor,consult,reason,type);
            int res = consultTeamService.addPrescriptionConsult(jwCode, getRepUID(),getUID(),doctor,consult,reason,type);
            if (res == -1) {
                return error(-1, "该处方存在未审核的续方，无法进行续方咨询！");
            } if (res == -2) {
                return error(-1, "您还未签约，不能发起续方咨询！");
            }
//            Doctor doctor = doctorService.findDoctorByCode(consult.getDoctor());

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/BookingController.java

@@ -5,7 +5,6 @@ import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.entity.patient.PatientReservation;
import com.yihu.wlyy.logs.BusinessLogs;
import com.yihu.wlyy.repository.message.SMSDao;
import com.yihu.wlyy.service.ZyDictDataService;
import com.yihu.wlyy.service.app.consult.ConsultService;
import com.yihu.wlyy.service.app.reservation.PatientReservationService;
import com.yihu.wlyy.service.common.SMSService;
@@ -76,33 +75,7 @@ public class BookingController extends WeixinBaseController {
    private HttpClientUtil HttpClientUtil;
    @Autowired
    private PushMsgTask pushMsgTask;
    @Autowired
    ZyDictDataService zyDictJob;
    /**
     * 启动任务
     * @return
     */
    @RequestMapping(value = "test", method = RequestMethod.GET)
    @ApiOperation("获取智业字典列表")
    @ResponseBody
    public String test() {
        try {
//            zyDictJob.synchronizeZyCommonDict();
//            zyDictJob.synchronizeZ_iv_staff_dict();
//            zyDictJob.synchronizeZy_iv_dept_staff_allot_dict();
//            zyDictJob.synchronizeZy_iv_diagnose_class_dict();
//            zyDictJob.synchronizeZy_iv_org_physic_allot_dict();
//            zyDictJob.synchronizeZy_iv_physic_dict();
//            zyDictJob.synchronizeZy_iv_staff_reg_type_allot_dict();//
//            zyDictJob.synchronizeZy_iv_subject_class_dict();
            zyDictJob.synchronizeZy_iv_dept_dict();
            return success("获取智业字典列表成功！");
        } catch (Exception e) {
            error(e);
            return invalidUserException(e, -1, "获取智业字典列表失败:" + e.getMessage());
        }
    }
    /**
     * 根据城市编码获取相应挂号服务