diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 30f2f04..1334313 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -253,7 +253,7 @@ public class Patients extends BaseModel { private Date husbandBirth; private String vcCardNo; //丈夫文化程度Id - private String hlevelTypeId; + //private String hlevelTypeId; //体验类型 private Integer expType; //person表主键 @@ -333,6 +333,160 @@ public class Patients extends BaseModel { //空或者1为正常 2为补录 private String normal; + + //结婚年龄 + private Integer marriageAge; + //文化程度 + private String levelTypeId; + //婚姻状态 1初婚 2 再婚 3其他 + private Integer marriageStatus; + + //是否婚检 1是 2否 + private Integer marriageCheck; + + //避孕方式 1 未避孕 2口服避孕药 3避孕套 4避孕膜 5其他 + private Integer contraceptionType; + private String contraceptionOther; + + //丈夫婚姻状态 1初婚 2 再婚 3其他 + private Integer hmarriageStatus; + + //丈夫健康状态 + private String healthStatus; + + //吸烟 1 否 2是 + private Integer smoke; + + //吸烟数量 + private String smokeNum; + + //饮酒 1偶尔 2 经常 3否 + private Integer drinkWine; + + //丈夫文化程度 + private String hlevelTypeId; + + //既往病史 + private String pastHistory; + + //家族遗传史 + private String familyHistory; + + //其他 + private String other; + + public Integer getMarriageAge() { + return marriageAge; + } + + public void setMarriageAge(Integer marriageAge) { + this.marriageAge = marriageAge; + } + + public String getLevelTypeId() { + return levelTypeId; + } + + public void setLevelTypeId(String levelTypeId) { + this.levelTypeId = levelTypeId; + } + + public Integer getMarriageStatus() { + return marriageStatus; + } + + public void setMarriageStatus(Integer marriageStatus) { + this.marriageStatus = marriageStatus; + } + + public Integer getMarriageCheck() { + return marriageCheck; + } + + public void setMarriageCheck(Integer marriageCheck) { + this.marriageCheck = marriageCheck; + } + + public Integer getContraceptionType() { + return contraceptionType; + } + + public void setContraceptionType(Integer contraceptionType) { + this.contraceptionType = contraceptionType; + } + + public String getContraceptionOther() { + return contraceptionOther; + } + + public void setContraceptionOther(String contraceptionOther) { + this.contraceptionOther = contraceptionOther; + } + + public Integer getHmarriageStatus() { + return hmarriageStatus; + } + + public void setHmarriageStatus(Integer hmarriageStatus) { + this.hmarriageStatus = hmarriageStatus; + } + + public String getHealthStatus() { + return healthStatus; + } + + public void setHealthStatus(String healthStatus) { + this.healthStatus = healthStatus; + } + + public Integer getSmoke() { + return smoke; + } + + public void setSmoke(Integer smoke) { + this.smoke = smoke; + } + + public String getSmokeNum() { + return smokeNum; + } + + public void setSmokeNum(String smokeNum) { + this.smokeNum = smokeNum; + } + + public Integer getDrinkWine() { + return drinkWine; + } + + public void setDrinkWine(Integer drinkWine) { + this.drinkWine = drinkWine; + } + + public String getPastHistory() { + return pastHistory; + } + + public void setPastHistory(String pastHistory) { + this.pastHistory = pastHistory; + } + + public String getFamilyHistory() { + return familyHistory; + } + + public void setFamilyHistory(String familyHistory) { + this.familyHistory = familyHistory; + } + + public String getOther() { + return other; + } + + public void setOther(String other) { + this.other = other; + } + public String getNormal() { return normal; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java index 3941eb6..94da3a9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java @@ -1,12 +1,11 @@ package com.lyms.platform.operate.web.controller; -import com.lyms.platform.biz.service.ApplyOrderService; -import com.lyms.platform.biz.service.SieveService; -import com.lyms.platform.biz.service.SyncDataService; +import com.lyms.platform.biz.service.*; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.pojo.SyncDataModel; +import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.Config; import com.lyms.platform.common.utils.ExceptionUtils; @@ -16,13 +15,8 @@ import com.lyms.platform.operate.web.facade.PatientServiceSysFacade; import com.lyms.platform.operate.web.facade.SysBaseFacade; import com.lyms.platform.operate.web.request.SqlRequest; import com.lyms.platform.permission.service.OrganizationService; -import com.lyms.platform.pojo.SieveApplyOrderModel; -import com.lyms.platform.pojo.SieveModel; -import com.lyms.platform.pojo.SieveResultModel; -import com.lyms.platform.query.SieveApplyOrderQuery; -import com.lyms.platform.query.SieveQuery; -import com.lyms.platform.query.SieveResultQuery; -import com.lyms.platform.query.SyncDataQuery; +import com.lyms.platform.pojo.*; +import com.lyms.platform.query.*; import org.apache.commons.codec.binary.Base64; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; @@ -37,6 +31,7 @@ import org.springframework.web.context.WebApplicationContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.lang.reflect.Method; +import java.util.Date; import java.util.List; /** @@ -58,6 +53,12 @@ public class SyncDataController extends BaseController { @Autowired private PatientServiceSysFacade patientServiceSysFacade; + @Autowired + private PersonService personService; + + @Autowired + private PatientsService patientsService; + public static String mongo_crypto_key = Config.getItem("mongo_crypto_key", "0"); /** @@ -292,4 +293,52 @@ public class SyncDataController extends BaseController { return baseResponse; } } + + + @ResponseBody + @RequestMapping(value = "/syncPatientInfo", method = RequestMethod.GET) + public BaseResponse syncPatientInfo(@RequestParam(required = true) String cardNos) { + try { + String[] arrays = cardNos.split(","); + for (String cardNo : arrays) + { + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setCardNo(cardNo); + String pid = ""; + List patientses = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isNotEmpty(patientses)) + { + for(Patients pat : patientses) + { + pid = pat.getPid(); + pat.setModified(new Date()); + patientsService.updatePatient(pat); + } + } + + if (StringUtils.isNotEmpty(pid)) + { + PersonModelQuery personModelQuery = new PersonModelQuery(); + personModelQuery.setId(pid); + List personModels = personService.queryPersons(personModelQuery); + if (CollectionUtils.isNotEmpty(personModels)) + { + for(PersonModel personModel : personModels) + { + personModel.setModified(new Date()); + personService.updatePerson(personModel,personModel.getId()); + } + } + } + + } + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); + } catch (Exception e) { + BaseResponse baseResponse = new BaseResponse(); + baseResponse.setObject(e.getMessage()); + baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); + baseResponse.setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); + return baseResponse; + } + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 60a6314..61eba98 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1578,6 +1578,12 @@ public class BookbuildingFacade { List liveType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LIVE_TYPE_ID); typeMap.put("liveType", liveType); + + //文化程度 + List levelType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LEVEL_TYPE_ID); + typeMap.put("levelType", levelType); + + //服务类型 List serviceType = ServiceTypeEnums.getServiceTypeList(); typeMap.put("serviceType", serviceType); @@ -1865,6 +1871,24 @@ public class BookbuildingFacade { patient.setTownOrgId(yunRequest.getTownOrgId()); //乐陵是妇幼下发医院id patient.setLowerHairOgrId(yunRequest.getLowerHairOgrId()); + + patient.setMarriageAge(yunRequest.getMarriageAge()); + patient.setLevelTypeId(yunRequest.getLevelTypeId()); + patient.setMarriageStatus(yunRequest.getMarriageStatus()); + patient.setMarriageCheck(yunRequest.getMarriageCheck()); + patient.setContraceptionType(yunRequest.getContraceptionType()); + patient.setContraceptionOther(yunRequest.getContraceptionOther()); + + patient.setHmarriageStatus(yunRequest.getHmarriageStatus()); + patient.setHealthStatus(yunRequest.getHealthStatus()); + patient.setSmoke(yunRequest.getSmoke()); + patient.setSmokeNum(yunRequest.getSmokeNum()); + patient.setDrinkWine(yunRequest.getDrinkWine()); + patient.setHlevelTypeId(yunRequest.getHlevelTypeId()); + patient.setPastHistory(yunRequest.getPastHistory()); + patient.setFamilyHistory(yunRequest.getFamilyHistory()); + patient.setOther(yunRequest.getOther()); + return patient; } @@ -2021,6 +2045,26 @@ public class BookbuildingFacade { result.setTownOrgId(p.getTownOrgId()); result.setNormal(p.getNormal() == null ? "1" : p.getNormal()); + + + + result.setMarriageAge(p.getMarriageAge()); + result.setLevelTypeId(p.getLevelTypeId()); + result.setMarriageStatus(p.getMarriageStatus()); + result.setMarriageCheck(p.getMarriageCheck()); + result.setContraceptionType(p.getContraceptionType()); + result.setContraceptionOther(p.getContraceptionOther()); + + result.setHmarriageStatus(p.getHmarriageStatus()); + result.setHealthStatus(p.getHealthStatus()); + result.setSmoke(p.getSmoke()); + result.setSmokeNum(p.getSmokeNum()); + result.setDrinkWine(p.getDrinkWine()); + result.setHlevelTypeId(p.getHlevelTypeId()); + result.setPastHistory(p.getPastHistory()); + result.setFamilyHistory(p.getFamilyHistory()); + result.setOther(p.getOther()); + return result; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index b24823e..3b52c7b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -383,6 +383,169 @@ public class YunBookbuildingAddRequest { //空或者1为正常 2为补录 private String normal; + + //结婚年龄 + private Integer marriageAge; + //文化程度 + private String levelTypeId; + //婚姻状态 1初婚 2 再婚 3其他 + private Integer marriageStatus; + + //是否婚检 1是 2否 + private Integer marriageCheck; + + //避孕方式 1 未避孕 2口服避孕药 3避孕套 4避孕膜 5其他 + private Integer contraceptionType; + private String contraceptionOther; + + //丈夫婚姻状态 1初婚 2 再婚 3其他 + private Integer hmarriageStatus; + + //丈夫健康状态 + private String healthStatus; + + //吸烟 1 否 2是 + private Integer smoke; + + //吸烟数量 + private String smokeNum; + + //饮酒 1偶尔 2 经常 3否 + private Integer drinkWine; + + //丈夫文化程度 + private String hlevelTypeId; + + //既往病史 + private String pastHistory; + + //家族遗传史 + private String familyHistory; + + //其他 + private String other; + + + public Integer getMarriageAge() { + return marriageAge; + } + + public void setMarriageAge(Integer marriageAge) { + this.marriageAge = marriageAge; + } + + public String getLevelTypeId() { + return levelTypeId; + } + + public void setLevelTypeId(String levelTypeId) { + this.levelTypeId = levelTypeId; + } + + public Integer getMarriageStatus() { + return marriageStatus; + } + + public void setMarriageStatus(Integer marriageStatus) { + this.marriageStatus = marriageStatus; + } + + public Integer getMarriageCheck() { + return marriageCheck; + } + + public void setMarriageCheck(Integer marriageCheck) { + this.marriageCheck = marriageCheck; + } + + public Integer getContraceptionType() { + return contraceptionType; + } + + public void setContraceptionType(Integer contraceptionType) { + this.contraceptionType = contraceptionType; + } + + public String getContraceptionOther() { + return contraceptionOther; + } + + public void setContraceptionOther(String contraceptionOther) { + this.contraceptionOther = contraceptionOther; + } + + public Integer getHmarriageStatus() { + return hmarriageStatus; + } + + public void setHmarriageStatus(Integer hmarriageStatus) { + this.hmarriageStatus = hmarriageStatus; + } + + public String getHealthStatus() { + return healthStatus; + } + + public void setHealthStatus(String healthStatus) { + this.healthStatus = healthStatus; + } + + public Integer getSmoke() { + return smoke; + } + + public void setSmoke(Integer smoke) { + this.smoke = smoke; + } + + public String getSmokeNum() { + return smokeNum; + } + + public void setSmokeNum(String smokeNum) { + this.smokeNum = smokeNum; + } + + public Integer getDrinkWine() { + return drinkWine; + } + + public void setDrinkWine(Integer drinkWine) { + this.drinkWine = drinkWine; + } + + public String getHlevelTypeId() { + return hlevelTypeId; + } + + public void setHlevelTypeId(String hlevelTypeId) { + this.hlevelTypeId = hlevelTypeId; + } + + public String getPastHistory() { + return pastHistory; + } + + public void setPastHistory(String pastHistory) { + this.pastHistory = pastHistory; + } + + public String getFamilyHistory() { + return familyHistory; + } + + public void setFamilyHistory(String familyHistory) { + this.familyHistory = familyHistory; + } + + public String getOther() { + return other; + } + + public void setOther(String other) { + this.other = other; + } + public String getNormal() { return normal; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java index e42fe5e..1b93dd2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java @@ -344,6 +344,169 @@ public class PregnantInfoResult { //分娩状态 0未终止妊娠 1终止妊娠 private Integer dueStatus; + + + //结婚年龄 + private Integer marriageAge; + //文化程度 + private String levelTypeId; + //婚姻状态 1初婚 2 再婚 3其他 + private Integer marriageStatus; + + //是否婚检 1是 2否 + private Integer marriageCheck; + + //避孕方式 1 未避孕 2口服避孕药 3避孕套 4避孕膜 5其他 + private Integer contraceptionType; + private String contraceptionOther; + + //丈夫婚姻状态 1初婚 2 再婚 3其他 + private Integer hmarriageStatus; + + //丈夫健康状态 + private String healthStatus; + + //吸烟 1 否 2是 + private Integer smoke; + + //吸烟数量 + private String smokeNum; + + //饮酒 1偶尔 2 经常 3否 + private Integer drinkWine; + + //丈夫文化程度 + private String hlevelTypeId; + + //既往病史 + private String pastHistory; + + //家族遗传史 + private String familyHistory; + + //其他 + private String other; + + public Integer getMarriageAge() { + return marriageAge; + } + + public void setMarriageAge(Integer marriageAge) { + this.marriageAge = marriageAge; + } + + public String getLevelTypeId() { + return levelTypeId; + } + + public void setLevelTypeId(String levelTypeId) { + this.levelTypeId = levelTypeId; + } + + public Integer getMarriageStatus() { + return marriageStatus; + } + + public void setMarriageStatus(Integer marriageStatus) { + this.marriageStatus = marriageStatus; + } + + public Integer getMarriageCheck() { + return marriageCheck; + } + + public void setMarriageCheck(Integer marriageCheck) { + this.marriageCheck = marriageCheck; + } + + public Integer getContraceptionType() { + return contraceptionType; + } + + public void setContraceptionType(Integer contraceptionType) { + this.contraceptionType = contraceptionType; + } + + public String getContraceptionOther() { + return contraceptionOther; + } + + public void setContraceptionOther(String contraceptionOther) { + this.contraceptionOther = contraceptionOther; + } + + public Integer getHmarriageStatus() { + return hmarriageStatus; + } + + public void setHmarriageStatus(Integer hmarriageStatus) { + this.hmarriageStatus = hmarriageStatus; + } + + public String getHealthStatus() { + return healthStatus; + } + + public void setHealthStatus(String healthStatus) { + this.healthStatus = healthStatus; + } + + public Integer getSmoke() { + return smoke; + } + + public void setSmoke(Integer smoke) { + this.smoke = smoke; + } + + public String getSmokeNum() { + return smokeNum; + } + + public void setSmokeNum(String smokeNum) { + this.smokeNum = smokeNum; + } + + public Integer getDrinkWine() { + return drinkWine; + } + + public void setDrinkWine(Integer drinkWine) { + this.drinkWine = drinkWine; + } + + public String getHlevelTypeId() { + return hlevelTypeId; + } + + public void setHlevelTypeId(String hlevelTypeId) { + this.hlevelTypeId = hlevelTypeId; + } + + public String getPastHistory() { + return pastHistory; + } + + public void setPastHistory(String pastHistory) { + this.pastHistory = pastHistory; + } + + public String getFamilyHistory() { + return familyHistory; + } + + public void setFamilyHistory(String familyHistory) { + this.familyHistory = familyHistory; + } + + public String getOther() { + return other; + } + + public void setOther(String other) { + this.other = other; + } + public List getChildExtAddrs() { return childExtAddrs; }