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

common/common-entity/src/main/java/com/yihu/wlyy/entity/patient/prescription/Prescription.java

@@ -38,10 +38,10 @@ public class Prescription extends IdEntity {
    private String ssc;//社保卡号
    private Integer type;                    //1 处方 2 续方
    private Integer status;                  //（-3 支付过期 -2 患者自己取消 ）续方取消，-1 审核不通过 ,
                                                // （0 待审核, 2调整中，3调整成功, 4调整失败 ,10 医生审核(CA)通过）审核中，
                                                // 20药师审核中,21.药师审核失败,30 开方中/药师审核成功,31.开方失败/预结算失败,
                                                // （40开方完成/待支付 ，41 支付失败 ）待支付，  50 支付成功/待配药，（60配药成功/待配送）等待领药，
                                                // （61配送失败62分配健管师 65配送中，69配送到服务站）配送中，（100配送到患者手中/已完成）已完成',
    // （0 待审核, 2调整中，3调整成功, 4调整失败 ,10 医生审核(CA)通过）审核中，
    // 20药师审核中,21.药师审核失败,30 开方中/药师审核成功,31.开方失败/预结算失败,
    // （40开方完成/待支付 ，41 支付失败 ）待支付，  50 支付成功/待配药，（60配药成功/待配送）等待领药，
    // （61配送失败62分配健管师 65配送中，69配送到服务站）配送中，（100配送到患者手中/已完成）已完成',
    private String doctor;                   //开处方的医生code 关联 wlyy_doctor
    private String doctorName;               //医生名称
    private Long adminTeamId;             //患者签约的行政团队
@@ -89,7 +89,7 @@ public class Prescription extends IdEntity {
    private String jwRegisterFee; //基卫-诊金
    private String prescribeReason; //开方失败/成功原因
    private Date prescribeTime ;//开方失败、成功时间
    private Date prescribeTime;//开方失败、成功时间
    private String dispensaryTypeName; //类型翻译
@@ -367,7 +367,7 @@ public class Prescription extends IdEntity {
    }
    public void setStatusName(String statusName) {
        this.statusName = getStatusName(status,null);
        this.statusName = getStatusName(status, null, null);
    }
    public Date getExpressageTime() {
@@ -379,7 +379,7 @@ public class Prescription extends IdEntity {
    }
    @Transient
    public static String getStatusName(Integer status, String hospitalName) {
    public static String getStatusName(Integer status, String hospitalName, String userName) {
        /**
         *  no_reviewed("审核不通过", -1),
@@ -443,10 +443,10 @@ public class Prescription extends IdEntity {
                return "支付失败";
            }
            case 50: {
                return " 支付成功/待配药";
                return " 订单已支付";
            }
            case 60: {
                return "配药成功/待配送";
                return "配药完成";
            }
            case 61: {
                return "配送失败";
@@ -458,15 +458,19 @@ public class Prescription extends IdEntity {
                return "配送中 ";
            }
            case 69: {
                if (StringUtils.isEmpty(hospitalName)) {
                if (StringUtils.isEmpty(hospitalName) || StringUtils.isEmpty(userName)) {
                    return "配送到服务站";
                }
                {
                    return "配送到" + hospitalName;
                    return "配送到" + hospitalName + ",接收人:" + userName;
                }
            }
            case 100: {
                return "续方完成";
                if (StringUtils.isEmpty(userName)) {
                    return "续方完成";
                } else {
                    return "续方完成,确认人:" + userName;
                }
            }
        }
        return "未知";
@@ -620,7 +624,7 @@ public class Prescription extends IdEntity {
    @Transient
    public String getDispensaryTypeName() {
        if(dispensaryType!=null){
        if (dispensaryType != null) {
            switch (this.dispensaryType) {
                case 1: {
                    return "自取";

common/common-entity/src/main/java/com/yihu/wlyy/entity/patient/prescription/PrescriptionLog.java

@@ -250,7 +250,7 @@ public class PrescriptionLog extends IdEntity {
    @Transient
    public String getStatusName() {
        return Prescription.getStatusName(this.status,hospitalName);
        return Prescription.getStatusName(this.status,hospitalName,userName);
    }
}

patient-co-customization/patient-co-modern-medicine/src/main/java/com/yihu/mm/controller/medicine/PhysicalExaminationController.java

@@ -67,7 +67,7 @@ public class PhysicalExaminationController extends BaseController {
        Patient patient = patientService.findByCode(patientCode);
        int isSignJM = patientService.isSignJM(patientCode);
        if(isSignJM==3){
        if(isSignJM==2){
            String insertslip = physicalExaminationService.insertslip(patient);
            JSONObject jsonQuestion = new JSONObject(insertslip);
            if(physicalExaminationService.getSuccess(jsonQuestion)){

patient-co-customization/patient-co-modern-medicine/src/main/java/com/yihu/mm/service/PatientService.java

@@ -42,21 +42,27 @@ public class PatientService {
     */
    public int isSignJM(String patientCode){
        SignFamily signFamily = familyContractService.findSignByPatient(patientCode);
        //未签约
        if(signFamily==null){
            Patient patient = findByCode(patientCode);
            //未签约判断是否在前门
            String city = patient.getCity();
            if("350200".equals(city)){
                return 1;
                return 1;//未签约  厦门居民
            }
            return 0;
            return 0;//未签约  非厦门居民
        }
        //签约
        String hospitalCode = signFamily.getHospital();
        Hospital hospital = hospitalService.findByCode(hospitalCode);
        String town = hospital.getTown();
        if("350211".equals(town)){
            return 2;
            return 2;  //签约  签约在集美
        }
        return 3;
        return 3;  //签约 但签约不在集美
    }
}

patient-co-customization/patient-co-modern-medicine/src/main/resources/application.yml

@@ -2,7 +2,7 @@ server:
  port: 8080
examCode: 84        #越人试卷编号
yuerenApi: http://192.168.131.123:8180/wlyy_admin/yueren       #越人api调用地址
yuerenApi: http://172.19.103.88:9099/wlyy-manage/yueren       #越人api调用地址
security:
  basic:
@@ -69,6 +69,15 @@ logging:
spring:
  profiles: test
  datasource:
      medicine:
        url: jdbc:mysql://172.19.103.77/medicine?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
        username: root
        password: 123456
      wlyy:
        url: jdbc:mysql://172.19.103.77/wlyy?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
        username: root
        password: 123456
---
@@ -99,8 +108,3 @@ yueren:
server:
  server_url: http://weixin.xmtyw.cn/wlyy-dev/
---
##开发连测试用这个版本的配置
spring:
  profiles: dev_test

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/entity/SignFamily.java

@@ -52,6 +52,7 @@ public class SignFamily extends IdEntity {
    private String familyCode;//签约code
    private Double expenses;//签约费用
    private String expensesStatus;//扣费状态【0未扣费 1已扣费 2已退费】
    private String expensesStatusName;
    private String signSource;// 签约来源【1 社区签约 2 移动签约】
    private String signDoctorCode;//簽約人code
    private String signDoctorName;//簽約人銘
@@ -512,4 +513,22 @@ public class SignFamily extends IdEntity {
    public void setStatusName(String statusName) {
        this.statusName = statusName;
    }
    @Transient
    public String getExpensesStatusName() {      //扣费状态【0未扣费 1已扣费 2已退费】
        if("2".equals(expensesStatus)){
            this.expensesStatusName = "已退费";
        }else if("1".equals(expensesStatus)){
            this.expensesStatusName = "已扣费";
        }else if("0".equals(expensesStatus)){
            this.expensesStatusName = "未扣费";
        }else{
            this.expensesStatusName = "";
        }
        return expensesStatusName;
    }
    public void setExpensesStatusName(String expensesStatusName) {
        this.expensesStatusName = expensesStatusName;
    }
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/repository/SignFamilyDao.java

@@ -37,4 +37,6 @@ public interface SignFamilyDao extends PagingAndSortingRepository<SignFamily, Lo
    @Query("select a from SignFamily a where a.patient = ?1 and a.status > 0 and expensesStatus=1")
    SignFamily findSignByPatient(String patient);
    @Query("select a from SignFamily a where a.patient = ?1 and a.status > 0 order by a.czrq desc")
    List<SignFamily> findSignInfo(String patient);
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/account/CustomerService.java

@@ -33,7 +33,7 @@ public class CustomerService{
		resp.put("family",familyMembers);
		//查询签约信息
		SignFamily signInfo = contractService.findSignByPatient(patient.getCode());
		SignFamily signInfo = contractService.findSignInfo(patient.getCode());
		if(signInfo!=null){
			signInfo.setStatusName("已签约");
		}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/family/FamilyMemberService.java

@@ -83,7 +83,7 @@ public class FamilyMemberService extends BaseService {
            JSONArray tem = new JSONArray();//存储其他
            for (Map<String, Object> map : result) {
                Map<String,Object> map1 = new HashMap();
                SignFamily sign = contractService.findSignByPatient(map.get("code").toString());
                SignFamily sign = contractService.findSignInfo(map.get("code").toString());
                boolean ssSign = false;
                boolean jtSign = false;
                map.put("statusName","未签约");
@@ -132,7 +132,7 @@ public class FamilyMemberService extends BaseService {
        //查询签约信息
        Map map = new HashMap<String,Object>();
        SignFamily sign = contractService.findSignByPatient(p.getCode());
        SignFamily sign = contractService.findSignInfo(p.getCode());
        boolean ssSign = false;
        boolean jtSign = false;
        map.put("statusName","未签约");

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/sign/FamilyContractService.java

@@ -38,4 +38,23 @@ public class FamilyContractService extends BaseService {
    public SignFamily findSignByPatient(String patient){
        return signFamilyDao.findSignByPatient(patient);
    }
    /**
     * 查询已签约,已缴费的签约信息
     * 若没有已缴费的--->>返回已签约的最新一条信息,否则返回null
     *
     * @param patient
     * @return
     */
    public SignFamily findSignInfo(String patient){
        SignFamily signFamily = findSignByPatient(patient);
        if(signFamily==null){
            List<SignFamily> signFamilies = signFamilyDao.findSignInfo(patient);
            if(signFamilies!=null && signFamilies.size()>0){
                return signFamilies.get(0);
            }
        }
        return signFamily;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/interceptors/GateWayInterceptor.java

@@ -29,6 +29,7 @@ import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.Controller;
import org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver;
import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -115,7 +116,7 @@ public class GateWayInterceptor implements HandlerInterceptor {
            output = JSONObject.fromObject(modelAndView.getModelMap()).toString();
        }
        HandlerMethod handlerMethod= (HandlerMethod) handler;
//        response.getOutputStream()
        String token = request.getHeader("accesstoken");
        String ip = NetworkUtil.getIpAddress(request);
@@ -141,8 +142,6 @@ public class GateWayInterceptor implements HandlerInterceptor {
    @Override
    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
        HandlerMethod handlerMethod= (HandlerMethod) handler;
    }
    public void saveHttpLog(String ip, String input, String output, String token, String method, Integer flag, String message) {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionExpressageService.java

@@ -56,7 +56,7 @@ public class PrescriptionExpressageService {
     * @return
     */
    public PrescriptionExpressage findByPrescriptionCode(String prescriptionCode) {
        return prescriptionExpressageDao.findByPrescriptionPay(prescriptionCode);
        return prescriptionExpressageDao.findByPrescriptionCode(prescriptionCode);
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionInfoService.java

@@ -896,7 +896,8 @@ public class PrescriptionInfoService extends BaseService {
                " LEFT(pr.create_time,19) AS createTime, " +
                " pr.doctor, " +
                " pr.dispensary_type AS dispensaryType," +
                " e.expressage_code AS expressageCode " +
                " e.expressage_code AS expressageCode, " +
                " e.expressage_name AS expressageName " +
                " FROM " +
                " wlyy_prescription pr " +
                " LEFT JOIN wlyy_patient p ON pr.patient = p.`code` " +

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/PrescriptionInfoController.java

@@ -195,7 +195,7 @@ public class PrescriptionInfoController extends BaseController {
                jo.put("dispensaryDispensaryType", prescription.getDispensaryType());//处方配送方式
                jo.put("dispensaryDispensaryTypeName", prescription.getDispensaryTypeName());//处方配送方式
                jo.put("prescriptionStatus", prescription.getStatus());//处方状态
                jo.put("prescriptionStatusName", prescription.getStatusName(prescription.getStatus(), ""));//处方状态名称
                jo.put("prescriptionStatusName", prescription.getStatusName(prescription.getStatus(), "",""));//处方状态名称
            }
            return write(200, "查询成功", "data", jo);
        } catch (Exception e) {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/PrescriptionLogController.java

@@ -100,8 +100,8 @@ public class PrescriptionLogController extends BaseController {
                prescriptionLog.setCreateTime(prescriptionExpressageLog.getCreateTime());
                prescriptionLog.setHospital(prescriptionExpressageLog.getAcceptHospital());
                prescriptionLog.setHospitalName(prescriptionExpressageLog.getAcceptHospitalName());
                prescriptionLog.setUserCode(prescriptionExpressageLog.getExpressageUserCode());
                prescriptionLog.setUserName(prescriptionExpressageLog.getExpressageUserName());
                prescriptionLog.setUserCode(prescriptionExpressageLog.getAcceptUser());
                prescriptionLog.setUserName(prescriptionExpressageLog.getAcceptUserName());
                prescriptionLogs.add(prescriptionLog);
            }
            //排序
@@ -111,9 +111,9 @@ public class PrescriptionLogController extends BaseController {
                long map2value = o2.getCreateTime().getTime();
                if (map1value - map2value > 0) {
                    return 1;
                } else if (map1value - map2value < 0) {
                    return -1;
                } else if (map1value - map2value < 0) {
                    return 1;
                } else {
                    return 0;
                }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/prescription/PatientPrescriptionController.java

@@ -244,7 +244,7 @@ public class PatientPrescriptionController extends WeixinBaseController {
                jo.put("dispensaryDispensaryType", prescription.getDispensaryType());//处方配送方式
                jo.put("dispensaryDispensaryTypeName", prescription.getDispensaryTypeName());//处方配送方式
                jo.put("prescriptionStatus", prescription.getStatus());//处方状态
                jo.put("prescriptionStatusName", prescription.getStatusName(prescription.getStatus(), ""));//处方状态名称
                jo.put("prescriptionStatusName", prescription.getStatusName(prescription.getStatus(), "",""));//处方状态名称
            }
            return write(200, "查询成功", "data", jo);
        } catch (Exception e) {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/prescription/PatientPrescriptionLogController.java

@@ -76,9 +76,9 @@ public class PatientPrescriptionLogController extends BaseController {
                long map2value = o2.getCreateTime().getTime();
                if (map1value - map2value > 0) {
                    return 1;
                } else if (map1value - map2value < 0) {
                    return -1;
                } else if (map1value - map2value < 0) {
                    return 1;
                } else {
                    return 0;
                }