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/vo/PatientVO.java

@@ -88,6 +88,8 @@ public class PatientVO {
	
	//设备类型（1血糖，2血压，3血糖+血压）
	private Integer deviceType;
	//医疗保险号
	private String medicareNumber;
	
	public String getCode() {
		return code;
@@ -401,4 +403,12 @@ public class PatientVO {
	public void setDiseasesum(Integer diseasesum) {
		this.diseasesum = diseasesum;
	}
	public String getMedicareNumber() {
		return medicareNumber;
	}
	public void setMedicareNumber(String medicareNumber) {
		this.medicareNumber = medicareNumber;
	}
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/label/SignPatientLabelInfoService.java

@@ -114,6 +114,8 @@ public class SignPatientLabelInfoService extends BaseService {
        json.put("sex", p.getSex());
        // 身份证号
        json.put("idcard", p.getIdcard());
        //1.4.2新增medicareNumber
        json.put("medicareNumber", p.getMedicareNumber());
        // 设置患者居住省份
        json.put("provinceName", p.getProvinceName());
        json.put("cityName", p.getCityName());

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

@@ -664,11 +664,13 @@ public class FamilyContractService extends BaseService {
     * @param patient 居民code
     * @return
     */
    public int sign(String doctor, String patient, String countryCode) throws Exception {
    public int sign(String doctor, String patient, String countryCode,String medicareNumber) throws Exception {
        Patient p = patientDao.findByCode(patient);
        if (p == null) {
            return -1;
        }
        //1.4.2设置居民医疗保险号
        setPatientMedicareNo(patient,medicareNumber);
        SignFamily sc = signFamilyDao.findByIdcard(p.getIdcard());
        //判断身份证号是否已签约
@@ -1015,7 +1017,7 @@ public class FamilyContractService extends BaseService {
                                     String emerMobile, String images,
                                     String healthLabel, String customLabel, String disease,
                                     String expenses, String signDoctorCode,
                                     String signDoctorName, String signDoctorLevel, long adminTeamCode, String sevId, String countryCode) throws Exception {
                                     String signDoctorName, String signDoctorLevel, long adminTeamCode, String sevId, String countryCode,String medicareNumber) throws Exception {
        // 查询是否有家庭签约
        SignFamily sc = signFamilyDao.findByIdcard(idcard);
        if (sc != null) {
@@ -1118,11 +1120,16 @@ public class FamilyContractService extends BaseService {
            patient.setStatus(1);
            patient.setDisease(0);
            patient.setPhoto("../../../images/p-female.png");
        }
        }
        //1.4。2设置居民医疗保险信息
        if(StringUtils.isNotBlank(medicareNumber)){
            patient.setMedicareNumber(medicareNumber);
        }
        // 保存用户信息
        patientDao.save(patient);
        Calendar now = Calendar.getInstance();
        int month = now.get(Calendar.MONTH) + 1;
        Calendar begin = Calendar.getInstance();
@@ -3355,7 +3362,18 @@ public class FamilyContractService extends BaseService {
        return result;
    }
    /**
     * 1.4.2 设置医疗卡号
     * @param patient
     * @param medicareNumber
     */
    public void setPatientMedicareNo(String patient,String medicareNumber){
        if(StringUtils.isNotBlank(medicareNumber)){
            Patient p = patientDao.findByCode(patient);
            p.setMedicareNumber(medicareNumber);
            patientDao.save(p);
        }
    }
    /**
     * 续签申请
     *
@@ -3364,11 +3382,13 @@ public class FamilyContractService extends BaseService {
     * @return
     */
    @Transactional
    public int signRenew(String doctor, String healthDoctor, String patient, String reason) throws Exception {
    public int signRenew(String doctor, String healthDoctor, String patient, String reason,String medicareNumber) throws Exception {
        Patient p = patientDao.findByCode(patient);
        if (p == null) {
            return -1;
        }
        //1.4.2 设置医疗卡号
        setPatientMedicareNo(patient,medicareNumber);
//        List<SignFamilyRenew> sc = signFamilyRenewDao.findByIdcard(p.getIdcard());
//        //判断身份证号是否已签约
@@ -3584,12 +3604,15 @@ public class FamilyContractService extends BaseService {
     * @return
     */
    @Transactional
    public int signRenewOverdue(String doctor, String healthDoctor, String patient, String reason, String countryCode) throws Exception {
    public int signRenewOverdue(String doctor, String healthDoctor, String patient, String reason, String countryCode,String medicareNumber) throws Exception {
        Patient p = patientDao.findByCode(patient);
        if (p == null) {
            return -1;
        }
        //1.4.2 设置医疗卡号
        setPatientMedicareNo(patient,medicareNumber);
        Doctor d = doctorDao.findByCode(doctor);
        Doctor hd = null;
        if (StringUtils.isNotBlank(healthDoctor)) {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/sign/DoctorFamilyContractController.java

@@ -435,7 +435,8 @@ public class DoctorFamilyContractController extends WeixinBaseController {
            @RequestParam(required = false) String signDoctorLevel,//簽約人等级
            @RequestParam(required = false) long adminTeamCode, //行政团队
            @RequestParam(required = false) String sevId,
            @RequestParam(required = false) String countryCode) {
            @RequestParam(required = false) String countryCode,
            @RequestParam(required = false) String medicareNumber) {
        try {
            if (StringUtils.isEmpty(idcard)) {
                return error(-1, "请输入身份证号！");
@@ -495,7 +496,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
            //1.3.5 新增居委会字段countryCode
            String sf = familyContractService.agent(getAccessToken(), name, doctor, doctorName,
                    healthDoctor, healthDoctorName, cDoctor.getHospital(), cDoctor.getHospitalName(),
                    idcard, ssc, mobile, emerMobile, images, healthLabel, customLabel, disease, expenses, signDoctorCode, signDoctorName, signDoctorLevel, adminTeamCode, sevId, countryCode);
                    idcard, ssc, mobile, emerMobile, images, healthLabel, customLabel, disease, expenses, signDoctorCode, signDoctorName, signDoctorLevel, adminTeamCode, sevId, countryCode,medicareNumber);
            if ("-1".equals(sf)) {
                return error(-2, "居民未建档！");
            } else {
@@ -883,6 +884,8 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                json.put("diseaseLevel", temp.getDiseaseCondition());
                // 设置患者身份证号
                json.put("idCard", temp.getIdcard());
                //1.4.2 医疗保险号
                json.put("medicareNumber", temp.getMedicareNumber());
                // 设置患者出生年月
                json.put("birthday", DateUtil.dateToStr(temp.getBirthday(), DateUtil.YYYY_MM_DD));
                // 设置患者手机号码

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

@@ -125,6 +125,8 @@ public class PatientController extends WeixinBaseController {
                json.put("idcard", CommonUtil.getIdcardEncode(temp.getIdcard()));//加密过的完整身份证
                // 设置社保卡号
                json.put("ssc", temp.getSsc());
                //设置医疗包保险号
                json.put("medicareNumber", temp.getMedicareNumber());
                // 设置省
                json.put("province", temp.getProvince());
                // 设置市

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/sign/FamilyContractController.java

@@ -424,7 +424,8 @@ public class FamilyContractController extends BaseController {
    @ApiOperation("签约申请")
    public String sign(@RequestParam(required = false)String doctor,
                       @RequestParam(required = false)String patient,
                       @RequestParam(required = false)String countryCode) {
                       @RequestParam(required = false)String countryCode,
                       @RequestParam(required = false)String medicareNumber) {
        try {
            if (StringUtils.isEmpty(doctor)) {
                return error(-1, "签约医生不能为空");
@@ -435,8 +436,8 @@ public class FamilyContractController extends BaseController {
               return error(-2, "用户未建档");
            }
            //==1.3.7===end===
            int result = familyContractService.sign(doctor,patient,countryCode);
            //1.4.2加入MedicareNumber字段入参
            int result = familyContractService.sign(doctor,patient,countryCode,medicareNumber);
            if (result == -1) {
                return error(-1, "用户信息查询失败");
@@ -466,7 +467,8 @@ public class FamilyContractController extends BaseController {
                            @RequestParam(required = false) String healthDoctor,
                            @RequestParam(required = false) String patient,
                            @RequestParam(required = false) String reason,
                            @RequestParam(required = false) String countryCode) {
                            @RequestParam(required = false) String countryCode,
                            @RequestParam(required = false) String medicareNumber) {
        try {
            if (StringUtils.isEmpty(doctor)) {
                return error(-1, "签约医生不能为空");
@@ -475,10 +477,10 @@ public class FamilyContractController extends BaseController {
            int month = cal.get(Calendar.MONTH)+1;
            int result = -1;
            if(month<7){
                result = familyContractService.signRenew(doctor,healthDoctor,patient,reason);
                result = familyContractService.signRenew(doctor,healthDoctor,patient,reason,medicareNumber);
            }else{
                //1.3.5新增居委会字段
                result = familyContractService.signRenewOverdue(doctor,healthDoctor,patient,reason,countryCode);
                result = familyContractService.signRenewOverdue(doctor,healthDoctor,patient,reason,countryCode,medicareNumber);
            }