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

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;
    }
}