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

patient-co-service/wlyy_sign/src/main/java/com/yihu/wlyy/sign/entity/Patient.java

@@ -78,6 +78,8 @@ public class Patient extends IdEntity {
	private String sickVillage;
	//居民预警状态：0为标准，1为预警状态
	private Integer standardStatus;
	//医疗保险号
	private String medicareNumber;
	public Patient() {
	}
@@ -332,4 +334,12 @@ public class Patient extends IdEntity {
	public void setStandardStatus(Integer standardStatus) {
		this.standardStatus = standardStatus;
	}
	
	public String getMedicareNumber() {
		return medicareNumber;
	}
	
	public void setMedicareNumber(String medicareNumber) {
		this.medicareNumber = medicareNumber;
	}
}

patient-co-service/wlyy_sign/src/main/java/com/yihu/wlyy/sign/service/SignRenewZYService.java

@@ -1461,7 +1461,7 @@ public class SignRenewZYService {
                        params.put("BIRTHDAY", DateUtil.dateToStrShort(patient.getBirthday()));
                        params.put("IDENTITY_CARD_NO", patient.getIdcard() == null ? sign.getIdcard() : patient.getIdcard());
                        params.put("CARD_NO", patient.getSsc() == null ? sign.getSsc() : patient.getSsc());
                        params.put("INSUR_SAFETY_NO", "");  //医疗保险号
                        params.put("INSUR_SAFETY_NO", patient.getMedicareNumber());  //医疗保险号
                        params.put("SICK_PHONE", patient.getMobile() == null ? "" : patient.getMobile());   //联系电话
                        params.put("SICK_COUNTY", patient.getTown() == null ? "" : patient.getTown());    //行政区
                        params.put("SICK_COUNTRY", patient.getStreet() == null ? "" : patient.getStreet());    //街道
@@ -1541,7 +1541,7 @@ public class SignRenewZYService {
                        params.put("BIRTHDAY", DateUtil.dateToStrShort(patient.getBirthday()));
                        params.put("IDENTITY_CARD_NO", patient.getIdcard() == null ? sign.getIdcard() : patient.getIdcard());
                        params.put("CARD_NO", patient.getSsc() == null ? sign.getSsc() : patient.getSsc());
                        params.put("INSUR_SAFETY_NO", "");  //医疗保险号
                        params.put("INSUR_SAFETY_NO", patient.getMedicareNumber());  //医疗保险号
                        params.put("SICK_PHONE", patient.getMobile() == null ? "" : patient.getMobile());   //联系电话
                        params.put("SICK_COUNTY", patient.getTown() == null ? "" : patient.getTown());    //行政区
                        params.put("SICK_COUNTRY", patient.getStreet() == null ? "" : patient.getStreet());    //街道
@@ -1697,7 +1697,7 @@ public class SignRenewZYService {
                    params.put("BIRTHDAY", DateUtil.dateToStrShort(patient.getBirthday()));
                    params.put("IDENTITY_CARD_NO", patient.getIdcard() == null ? sign.getIdcard() : patient.getIdcard());
                    params.put("CARD_NO", patient.getSsc() == null ? sign.getSsc() : patient.getSsc());
                    params.put("INSUR_SAFETY_NO", "");  //医疗保险号
                    params.put("INSUR_SAFETY_NO",patient.getMedicareNumber());  //医疗保险号
                    params.put("SICK_PHONE", patient.getMobile() == null ? "" : patient.getMobile());   //联系电话
                    params.put("SICK_COUNTY", patient.getTown() == null ? "" : patient.getTown());    //行政区
                    params.put("SICK_COUNTRY", patient.getStreet() == null ? "" : patient.getStreet());    //街道
@@ -2087,7 +2087,7 @@ public class SignRenewZYService {
                    params.put("BIRTHDAY", DateUtil.dateToStrShort(patient.getBirthday()));
                    params.put("IDENTITY_CARD_NO", patient.getIdcard() == null ? sign.getIdcard() : patient.getIdcard());
                    params.put("CARD_NO", patient.getSsc() == null ? sign.getSsc() : patient.getSsc());
                    params.put("INSUR_SAFETY_NO", "");  //医疗保险号
                    params.put("INSUR_SAFETY_NO", patient.getMedicareNumber());  //医疗保险号
                    params.put("SICK_PHONE", patient.getMobile() == null ? "" : patient.getMobile());   //联系电话
                    params.put("SICK_COUNTY", patient.getTown() == null ? "" : patient.getTown());    //行政区
                    params.put("SICK_COUNTRY", patient.getStreet() == null ? "" : patient.getStreet());    //街道

patient-co-service/wlyy_sign/src/main/java/com/yihu/wlyy/sign/service/SignZYService.java

@@ -1407,7 +1407,7 @@ public class SignZYService {
                    params.put("BIRTHDAY", DateUtil.dateToStrShort(patient.getBirthday()));
                    params.put("IDENTITY_CARD_NO", patient.getIdcard() == null ? sign.getIdcard() : patient.getIdcard());
                    params.put("CARD_NO", patient.getSsc() == null ? sign.getSsc() : patient.getSsc());
                    params.put("INSUR_SAFETY_NO", "");  //医疗保险号
                    params.put("INSUR_SAFETY_NO", patient.getMedicareNumber());  //医疗保险号
                    params.put("SICK_PHONE", patient.getMobile() == null ? "" : patient.getMobile());   //联系电话
                    params.put("SICK_COUNTY", patient.getTown() == null ? "" : patient.getTown());    //行政区
                    params.put("SICK_COUNTRY", patient.getStreet() == null ? "" : patient.getStreet());    //街道

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/service/third/jw/JwPrescriptionService.java

@@ -1274,7 +1274,6 @@ public class JwPrescriptionService {
                elastricSearchSave.save(resultdata,esIndex,esType);
            }
//            logger.info("同步单条随访记录-ES数据保存成功，时间："+DateUtil.getStringDate());
            jestClient.shutdownClient();
        }catch (Exception e){
            logger.error(" save error ：" + e.getMessage());
            e.printStackTrace();