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/demographic/FamilyInfo.java

@@ -69,6 +69,9 @@ public class FamilyInfo implements java.io.Serializable {
        this.mzdzm = mzdzm;
    }
    public FamilyInfo() {
    }
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
    @Column(name = "ID", unique = true, nullable = false)

patient-co-service/wlyy_service/src/main/resources/application.yml

@@ -75,7 +75,8 @@ spring:
spring:
  profiles: test
  datasource:
    url: jdbc:mysql://172.17.110.160:3306/wlyy?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#    url: jdbc:mysql://172.17.110.160:3306/wlyy?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    url: jdbc:mysql://172.19.103.85:3306/wlyy?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: ssgg
    password: ssgg
    driverClassName: com.mysql.jdbc.Driver

patient-co-service/wlyy_service/src/main/resources/system.properties

@@ -15,4 +15,6 @@ ca_namespace = http://platfomservice.xmca.com/
#gateway_licence = 5YGl5bq45LmL7Lev
#gateway_public_key = PublicGov.key
#jw_hospital = 350211B1004
#jw_licence = 5YGl5bq35LmL6LevMzUwMjExQjEwMDQ=
#jw_licence = 5YGl5bq35LmL6LevMzUwMjExQjEwMDQ=
#ca_url = http://117.29.183.114:8081/XMCAService?wsdl
#ca_namespace = http://platfomservice.xmca.com/

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

@@ -37,7 +37,7 @@ public class DoctorInterceptor extends BaseInterceptor {
    @Override
    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
        boolean flag = true;
        if(Flag.close.equals(status)){
        if(Flag.close.getValue().equals(status)){
            return true;
        }

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

@@ -63,7 +63,9 @@ public class GateWayInterceptor implements HandlerInterceptor {
     */
    @Override
    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
        if(Flag.close.getValue().equals(status)){
            return true;
        }
        boolean flag = true;
        String accesstoken = request.getHeader("accesstoken");
        String ip = NetworkUtil.getIpAddress(request);

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

@@ -35,7 +35,11 @@ public class PatientInterceptor extends BaseInterceptor {
    @Override
    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
        boolean flag = true;
        if(Flag.close.getValue().equals(status)){
            return true;
        }
        try {
            request.setCharacterEncoding("UTF-8");
            response.setHeader("Content-type", "text/html;charset=UTF-8");
            request.setAttribute("log-start", new Date().getTime());

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

@@ -320,6 +320,13 @@ public class PrescriptionExpressagePCService extends BaseService {
        //修改取药码code为已经使用
        prescriptionDispensaryCode.setIsUse(1);
        //更新配送信息
        PrescriptionExpressage prescriptionExpressage = prescriptionExpressageDao.findByPrescriptionCode(prescriptionDispensaryCode.getPrescriptionCode());
        prescriptionExpressage.setHospitalDoctor(doctorDao.findByCode(userCode).getName());
        prescriptionExpressage.setHospitalDoctorCode(userCode);
        prescriptionExpressage.setFetchingMedicineTime(new Date());
        prescriptionExpressageDao.save(prescriptionExpressage);
    }
@@ -366,5 +373,13 @@ public class PrescriptionExpressagePCService extends BaseService {
        prescriptionNoticesService.sendMessages(patientCode, doctor.getName(), DateUtil.dateToStrLong(expressageing), 3, 0, url);
        //更新配送信息
        PrescriptionExpressage prescriptionExpressage = prescriptionExpressageDao.findByPrescriptionCode(prescriptionDispensaryCode.getPrescriptionCode());
        prescriptionExpressage.setHospitalDoctor(doctorDao.findByCode(userCode).getName());
        prescriptionExpressage.setHospitalDoctorCode(userCode);
        prescriptionExpressage.setFetchingMedicineTime(new Date());
        prescriptionExpressage.setExpressageTime(new Date());
        prescriptionExpressageDao.save(prescriptionExpressage);
    }
}

patient-co/patient-co-wlyy/src/main/resources/application.yml

@@ -84,11 +84,11 @@ security:
##拦截器开关
interceptor:
  doctor:
    status: 0 ###  1开启 0 关闭
    status: 1 ###  1开启 0 关闭
  patient:
    status: 0 ###  1开启 0 关闭
    status: 1 ###  1开启 0 关闭
  accesstoken:
    status: 0 ###  1开启 0 关闭
    status: 1 ###  1开启 0 关闭
    time: 2 ##对外接的accesstoken生命周期 2小时
---