Commit 343ef2be8165812569d7595f888094bac3802ec3

Authored by dongqin
1 parent 9ee73894f3

添加type

Showing 2 changed files with 83 additions and 32 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CommonRequest.java View file @ 343ef2b
... ... @@ -28,6 +28,19 @@
28 28 */
29 29 private String mataFollowId;
30 30  
  31 + /**
  32 + * 1 孕妇建档 2 妇女建档 3 叶酸建档
  33 + */
  34 + private String type;
  35 +
  36 + public String getType() {
  37 + return type;
  38 + }
  39 +
  40 + public void setType(String type) {
  41 + this.type = type;
  42 + }
  43 +
31 44 public CommonRequest clone() throws CloneNotSupportedException {
32 45 CommonRequest clone = (CommonRequest) super.clone();
33 46 String cardNo = clone.getCardNo();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CommonServerImpl.java View file @ 343ef2b
... ... @@ -22,7 +22,13 @@
22 22 import com.lyms.platform.operate.web.service.ICommonServer;
23 23 import com.lyms.platform.operate.web.utils.CollectionUtils;
24 24 import com.lyms.platform.operate.web.utils.CommonsHelper;
  25 +import com.lyms.platform.permission.dao.master.FolviteMapper;
  26 +import com.lyms.platform.permission.dao.master.FolviteReceiveMapper;
  27 +import com.lyms.platform.permission.model.FolviteQuery;
  28 +import com.lyms.platform.permission.model.FolviteRecordQuery;
25 29 import com.lyms.platform.pojo.BasicConfig;
  30 +import com.lyms.platform.pojo.FolviteReceiveRecordModel;
  31 +import com.lyms.platform.pojo.FolviteRecordModel;
26 32 import com.lyms.platform.pojo.MaternalDeliverModel;
27 33 import com.lyms.platform.pojo.Patients;
28 34 import com.lyms.platform.pojo.PersonModel;
... ... @@ -42,6 +48,9 @@
42 48 @Autowired
43 49 private BasicConfigService basicConfigService;
44 50  
  51 + @Autowired
  52 + private FolviteMapper folviteMapper;
  53 +
45 54 private static final Logger log = LoggerFactory.getLogger(CommonServerImpl.class);
46 55  
47 56 /**
48 57  
49 58  
... ... @@ -135,11 +144,12 @@
135 144 public BaseResponse baseInfoByKeyword(CommonRequest param) {
136 145 PatientBaseInfoRequest result = new PatientBaseInfoRequest();
137 146 String cardNo = param.getCardNo();
  147 + String type = param.getType();
  148 +
138 149 // 身份证号
139 150 if (StringUtils.isNotEmpty(cardNo)) {
140   - getResultByCardNo(result, cardNo);
  151 + getResultByCardNo(result, cardNo, type);
141 152  
142   -
143 153 }
144 154  
145 155 // 孕妇id
... ... @@ -147,7 +157,7 @@
147 157 if (StringUtils.isNotEmpty(pid)) {
148 158 PersonModel personModel = mongoTemplate.findOne(Query.query(Criteria.where("id").is(pid)), PersonModel.class);
149 159 if (personModel != null) {
150   - getResultByCardNo(result, personModel.getCardNo());
  160 + getResultByCardNo(result, personModel.getCardNo(), type);
151 161 }
152 162 }
153 163  
... ... @@ -156,7 +166,7 @@
156 166 if (StringUtils.isNotEmpty(womenId)) {
157 167 ResidentsArchiveModel archiveModel = mongoTemplate.findOne(Query.query(Criteria.where("id").is(womenId)), ResidentsArchiveModel.class);
158 168 if (archiveModel != null) {
159   - getResultByCardNo(result, archiveModel.getCertificateNum());
  169 + getResultByCardNo(result, archiveModel.getCertificateNum(), type);
160 170 }
161 171 }
162 172 BaseResponse baseResponse = new BaseResponse();
163 173  
164 174  
165 175  
166 176  
167 177  
... ... @@ -170,42 +180,70 @@
170 180 * @param result
171 181 * @param cardNo
172 182 */
173   - private void getResultByCardNo(PatientBaseInfoRequest result, String cardNo) {
  183 + private void getResultByCardNo(PatientBaseInfoRequest result, String cardNo, String type) {
174 184 // 孕妇
175   - PersonModel personModel = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(cardNo)), PersonModel.class);
176   - if (personModel != null) {
177   - result.setName(personModel.getName());
178   - result.setPhone(personModel.getPhone());
179   - Date birth = personModel.getBirth();
180   - if (birth != null) {
181   - result.setBirth(DateUtil.getyyyy_MM_dd(personModel.getBirth()));
182   - result.setAge(DateUtil.getAge(birth).toString());
  185 + if ("1".equals(type)) {
  186 + PersonModel personModel = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(cardNo)), PersonModel.class);
  187 + if (personModel != null) {
  188 + result.setName(personModel.getName());
  189 + result.setPhone(personModel.getPhone());
  190 + Date birth = personModel.getBirth();
  191 + if (birth != null) {
  192 + result.setBirth(DateUtil.getyyyy_MM_dd(personModel.getBirth()));
  193 + result.setAge(DateUtil.getAge(birth).toString());
  194 + }
  195 + result.setCardNo(cardNo);
  196 + List<Patients> patients = mongoTemplate.find(Query.query(Criteria.where("pid").is(personModel.getId())).with(new Sort(Sort.Direction.DESC, "created")), Patients.class);
  197 + if (CollectionUtils.isNotEmpty(patients)) {
  198 + Patients patient = patients.get(0);
  199 + String addressStr = CommonsHelper.getResidence(patient.getAddressRegister(), patient.getProvinceRegisterId(), patient.getCityRegisterId(),
  200 + patient.getAreaRegisterId(), patient.getStreetRegisterId(), basicConfigService);
  201 + result.setAddressStr(addressStr);
  202 + }
183 203 }
184   - result.setCardNo(cardNo);
185   - List<Patients> patients = mongoTemplate.find(Query.query(Criteria.where("pid").is(personModel.getId())).with(new Sort(Sort.Direction.DESC, "created")), Patients.class);
186   - if (CollectionUtils.isNotEmpty(patients)) {
187   - Patients patient = patients.get(0);
188   - String addressStr = CommonsHelper.getResidence(patient.getAddressRegister(), patient.getProvinceRegisterId(), patient.getCityRegisterId(),
189   - patient.getAreaRegisterId(), patient.getStreetRegisterId(), basicConfigService);
  204 + }
  205 +
  206 +
  207 + // 妇女
  208 + if ("2".equals(type)) {
  209 + ResidentsArchiveModel certificateNumModel = mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(cardNo)), ResidentsArchiveModel.class);
  210 + if (certificateNumModel != null) {
  211 + result.setName(certificateNumModel.getUsername());
  212 + result.setPhone(certificateNumModel.getPhone());
  213 + Date birthday = certificateNumModel.getBirthday();
  214 + if (birthday != null) {
  215 + result.setBirth(DateUtil.getyyyy_MM_dd(birthday));
  216 + result.setAge(DateUtil.getAge(birthday).toString());
  217 + }
  218 + result.setCardNo(cardNo);
  219 + String addressStr = CommonsHelper.getResidence(certificateNumModel.getProvinceId(), certificateNumModel.getCityId(), certificateNumModel.getAreaId(),
  220 + certificateNumModel.getStreetId(), certificateNumModel.getAddress(),basicConfigService);
190 221 result.setAddressStr(addressStr);
191 222 }
192 223 }
193 224  
194   - // 妇女
195   - ResidentsArchiveModel certificateNumModel = mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(cardNo)), ResidentsArchiveModel.class);
196   - if (certificateNumModel != null) {
197   - result.setName(certificateNumModel.getUsername());
198   - result.setPhone(certificateNumModel.getPhone());
199   - Date birthday = certificateNumModel.getBirthday();
200   - if (birthday != null) {
201   - result.setBirth(DateUtil.getyyyy_MM_dd(birthday));
202   - result.setAge(DateUtil.getAge(birthday).toString());
  225 + // 叶酸建档
  226 + if ("3".equals(type)) {
  227 + FolviteQuery query = new FolviteQuery();
  228 + query.setCardNo(cardNo);
  229 + query.setSort("created desc");
  230 + List<FolviteRecordModel> folviteRecordModels = folviteMapper.queryList(query);
  231 + if (CollectionUtils.isNotEmpty(folviteRecordModels)) {
  232 + FolviteRecordModel folviteRecordModel = folviteRecordModels.get(0);
  233 + result.setName(folviteRecordModel.getName());
  234 + Date birthday = folviteRecordModel.getBirthday();
  235 + if (birthday != null) {
  236 + result.setBirth(DateUtil.getyyyy_MM_dd(birthday));
  237 + result.setAge(DateUtil.getAge(birthday).toString());
  238 + }
  239 + result.setCardNo(cardNo);
  240 + String addressStr = CommonsHelper.getResidence(folviteRecordModel.getHabitationProvince(), folviteRecordModel.getHabitationCity(),
  241 + folviteRecordModel.getHabitationArea(), folviteRecordModel.getHabitationCountry(), folviteRecordModel.getHabitationAddress(), basicConfigService);
  242 + result.setAddressStr(addressStr);
203 243 }
204   - result.setCardNo(cardNo);
205   - String addressStr = CommonsHelper.getResidence(certificateNumModel.getProvinceId(), certificateNumModel.getCityId(), certificateNumModel.getAreaId(),
206   - certificateNumModel.getStreetId(), certificateNumModel.getAddress(),basicConfigService);
207   - result.setAddressStr(addressStr);
  244 +
208 245 }
  246 +
209 247 }
210 248 }