Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/account/DoctorInfoService.java

@@ -1440,7 +1440,8 @@ public class DoctorInfoService extends BaseService {
                    }
                }
            }else{
                throw new Exception(responseObject.getString("msg"));
                String error = msg.split(":")[2];
                throw new Exception(error);
            }
        }else{
            throw new Exception("null response.");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/pc/prescription/PrescriptionExpressagePCService.java

@@ -96,7 +96,8 @@ public class PrescriptionExpressagePCService extends BaseService {
                            jsonObject.put("dispensaryType",result.get("dispensaryType"));
                            jsonObject.put("expressageName",result.get("expressageName"));
                            jsonObject.put("expressageMobile",result.get("expressageMobile"));
                            jsonObject.put("fetchingMedicineTime",result.get("fetchingMedicineTime"));
                            String date = result.get("fetchingMedicineTime")!=null?DateUtil.dateToStr((Date)result.get("fetchingMedicineTime"),"yyyy-MM-dd HH:mm:ss"):"";
                            jsonObject.put("fetchingMedicineTime",date);
                            jsonObject.put("hospitalDoctor",result.get("hospitalDoctor"));
//                            return jsonObject;
                        }else{
@@ -112,6 +113,9 @@ public class PrescriptionExpressagePCService extends BaseService {
                            jsonObject.put("dispensaryType",result.get("dispensaryType"));
                            jsonObject.put("expressageName",result.get("expressageName"));
                            jsonObject.put("expressageMobile",result.get("expressageMobile"));
                            String date = result.get("fetchingMedicineTime")!=null?DateUtil.dateToStr((Date)result.get("fetchingMedicineTime"),"yyyy-MM-dd HH:mm:ss"):"";
                            jsonObject.put("fetchingMedicineTime",date);
                            jsonObject.put("hospitalDoctor",result.get("hospitalDoctor"));
                        }
                        break;
                    }
@@ -119,7 +123,7 @@ public class PrescriptionExpressagePCService extends BaseService {
                    case 2:{
                        //判断出药机构是否与健管师所属机构一致，不一致弹窗提示：“出药机构与您所在机构不一致，无法出药，请重新确认”。一致则进入下一步。
                        if(doctor.getHospital().equals(result.get("hospitalCode")!=null?result.get("hospitalCode").toString():"")){
                        if(doctor.getHospital().equals(result.get("hospitalCode")!=null?result.get("hospitalCode")+"":"")){
                            //20开方完成/待支付, 21 支付失败 , 30 支付成功/待配药 , 40配药成功/待配送  41配送失败 42分配健管师 45配送中   49配送到服务站  100配送到患者手中/已完成
                            if(status==50){
                                jsonObject.put("flag",-5);//订单正在配药中，暂时无法出药
@@ -136,6 +140,9 @@ public class PrescriptionExpressagePCService extends BaseService {
                                jsonObject.put("dispensaryType",result.get("dispensaryType"));
                                jsonObject.put("expressageName",result.get("expressageName"));
                                jsonObject.put("expressageMobile",result.get("expressageMobile"));
                                String date = result.get("fetchingMedicineTime")!=null?DateUtil.dateToStr((Date)result.get("fetchingMedicineTime"),"yyyy-MM-dd HH:mm:ss"):"";
                                jsonObject.put("fetchingMedicineTime",date);
                                jsonObject.put("hospitalDoctor",result.get("hospitalDoctor"));
                            }else{
//                                jsonObject = new JSONObject(result);
                                jsonObject.put("flag",-6);//”订单已取药，出药人：张三，出药时间：XXXX-XX-XX，无法重新出药
@@ -149,6 +156,9 @@ public class PrescriptionExpressagePCService extends BaseService {
                                jsonObject.put("dispensaryType",result.get("dispensaryType"));
                                jsonObject.put("expressageName",result.get("expressageName"));
                                jsonObject.put("expressageMobile",result.get("expressageMobile"));
                                String date = result.get("fetchingMedicineTime")!=null?DateUtil.dateToStr((Date)result.get("fetchingMedicineTime"),"yyyy-MM-dd HH:mm:ss"):"";
                                jsonObject.put("fetchingMedicineTime",date);
                                jsonObject.put("hospitalDoctor",result.get("hospitalDoctor"));
                            }
                        }else{
                            jsonObject.put("flag",-4);//出药机构与您所在机构不一致，无法出药，请重新确认

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/account/DoctorController.java

@@ -1,39 +1,41 @@
package com.yihu.wlyy.web.doctor.account;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import com.yihu.wlyy.aop.ObserverRequired;
import com.yihu.wlyy.entity.consult.ConsultTeam;
import com.yihu.wlyy.entity.doctor.team.sign.SignPatientLabel;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.doctor.profile.DoctorComment;
import com.yihu.wlyy.entity.doctor.team.sign.SignPatientLabel;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.entity.organization.HospitalDept;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.entity.patient.SignFamily;
import com.yihu.wlyy.entity.patient.SocialSecurityInfo;
import com.yihu.wlyy.repository.doctor.DoctorAdminTeamDao;
import com.yihu.wlyy.repository.doctor.SignPatientLabelDao;
import com.yihu.wlyy.repository.patient.SocialSecurityInfoDao;
import com.yihu.wlyy.service.app.account.DoctorInfoService;
import com.yihu.wlyy.service.app.account.PatientInfoService;
import com.yihu.wlyy.service.app.consult.ConsultTeamService;
import com.yihu.wlyy.service.app.consult.DoctorCommentService;
import com.yihu.wlyy.service.app.hospital.HospitalDeptService;
import com.yihu.wlyy.service.app.hospital.HospitalService;
import com.yihu.wlyy.service.app.scheduling.DoctorWorkTimeService;
import com.yihu.wlyy.service.app.sign.FamilyContractService;
import com.yihu.wlyy.service.app.team.DrHealthTeamService;
import com.yihu.wlyy.service.common.account.RoleService;
import com.yihu.wlyy.util.*;
import com.yihu.wlyy.service.common.account.TokenService;
import com.yihu.wlyy.util.CommonUtil;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.util.IdcardValidator;
import com.yihu.wlyy.util.RSAUtils;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.NameValuePair;
import org.apache.http.message.BasicNameValuePair;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.http.MediaType;
@@ -42,18 +44,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springside.modules.security.utils.Digests;
import org.springside.modules.utils.Encodes;
import com.yihu.wlyy.service.app.account.DoctorInfoService;
import com.yihu.wlyy.service.app.consult.DoctorCommentService;
import com.yihu.wlyy.service.app.hospital.HospitalService;
import com.yihu.wlyy.service.app.sign.FamilyContractService;
import com.yihu.wlyy.service.app.team.DrHealthTeamService;
import com.yihu.wlyy.service.common.account.TokenService;
import com.yihu.wlyy.web.BaseController;
import com.yihu.wlyy.entity.patient.SocialSecurityInfo;
import com.yihu.wlyy.repository.patient.SocialSecurityInfoDao;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
/**
 * 用户注册的Controller.
@@ -568,6 +563,8 @@ public class DoctorController extends BaseController {
                json.put("cityName", temp.getCityName());
                // 设置医院名称
                json.put("hospitalName", temp.getHospitalName());
                // 设置医院
                json.put("hospital", temp.getHospital());
                // 设置部门名称
                json.put("deptName", StringUtils.isNotEmpty(temp.getDeptName()) ? temp.getDeptName() : "");
                // 设置职称

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescriptionPC/PrescriptionExpressagePCController.java

@@ -29,7 +29,7 @@ public class PrescriptionExpressagePCController extends BaseController {
        try{
            JSONObject jSONObject = prescriptionExpressagePCService.getMedicine(code,getUID());
//            jSONObject.toString().replace("\\","");
            Integer status = jSONObject.getInteger("status");
            Integer status = jSONObject.getInteger("flag");
            if(status==-3||status==-100){
                return error(-1, "获取信息失败！");
            }