liquanyu / regional-platform

Download as
Browse Code »

Commit dafc12239b2124d3732dc7b8af7d1706df045047

Authored by yangfei
1 parent cc6a32c66f
Exists in master and in 1 other branch dev

自动生成追访信息

Showing 1 changed file with 44 additions and 21 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ dafc122
... ... @@ -143,7 +143,7 @@
143 143 temp.put("bookbuild", 1); // 孕期建档 1=勾勾 2=叉叉
144 144 temp.put("bookbuildDate", DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate()));
145 145  
146   - if (patients.getDueStatus() == 1 || (patients.getIsAutoFm()!=null&& patients.getIsAutoFm() == 1)) {//终止妊娠,或自动分娩
  146 + if (patients.getDueStatus() == 1 || (patients.getIsAutoFm() != null && patients.getIsAutoFm() == 1)) {//终止妊娠,或自动分娩
147 147 temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉
148 148 } else if (patients.getType() == 3) {
149 149 temp.put("fm", 1); // 分娩 1=勾勾 2=叉叉
... ... @@ -258,7 +258,7 @@
258 258 temp.put("bookbuild", 1); // 孕期建档 1=勾勾 2=叉叉
259 259  
260 260  
261   - if (patient.getDueStatus() == 1 || (patient.getIsAutoFm()!=null&&patient.getIsAutoFm() == 1)) {//终止妊娠,或自动分娩
  261 + if (patient.getDueStatus() == 1 || (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1)) {//终止妊娠,或自动分娩
262 262 temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉
263 263 } else if (patient.getType() == 3) { //本院已分娩
264 264 temp.put("fm", 1); // 孕期建档 1=勾勾 2=叉叉
265 265  
266 266  
267 267  
268 268  
269 269  
270 270  
271 271  
272 272  
273 273  
... ... @@ -323,38 +323,61 @@
323 323 */
324 324 private void isExitTrackDown(TrackDownRecord trackDownRecord, Map<String, Object> map) {
325 325 if (trackDownRecord != null) {
326   - if ((int) map.get("bookbuild") == 3) {//孕期建档
327   - //如果当前流程已经结束流程，则显示X
328   - if (trackDownRecord.getTrackType() <= TrackDownDateEnums.B.getId()) {
  326 + if (trackDownRecord.getStatus() == 0) {//已经终止流程
  327 + if ((int) map.get("bookbuild") == 3) {//孕期建档
329 328 map.put("bookbuild", 2);
330 329 }
331   - }
332 330  
333   - if ((int) map.get("cqsc") == 3) {//产前筛查
334   - //如果当前流程已经结束流程，则显示X
335   - if (trackDownRecord.getTrackType() <= TrackDownDateEnums.C.getId()) {
  331 + if ((int) map.get("cqsc") == 3) {//产前筛查
336 332 map.put("cqsc", 2);
337 333 }
338   - }
339 334  
340   - if ((int) map.get("fm") == 3) {//分娩
341   - //如果当前流程已经结束流程，则显示X
342   - if (trackDownRecord.getTrackType() <= TrackDownDateEnums.E.getId()) {
  335 + if ((int) map.get("fm") == 3) {//分娩
343 336 map.put("fm", 2);
344 337 }
345   - }
346 338  
347   - if ((int) map.get("chfc") == 3) {//产后复查
348   - //如果当前流程已经结束流程，则显示X
349   - if (trackDownRecord.getTrackType() <= TrackDownDateEnums.F.getId()) {
  339 + if ((int) map.get("chfc") == 3) {//产后复查
350 340 map.put("chfc", 2);
351 341 }
352   - }
353 342  
354   - if ((int) map.get("check") == 3) {//婚检
355   - //如果当前流程已经结束流程，则显示X
356   - if (trackDownRecord.getTrackType() <= TrackDownDateEnums.A.getId()) {
  343 + if ((int) map.get("check") == 3) {//婚检
357 344 map.put("check", 2);
  345 + }
  346 + } else {
  347 + if ((int) map.get("bookbuild") == 3) {//孕期建档
  348 +
  349 + //如果当前流程已经结束流程，则显示X
  350 + if (trackDownRecord.getTrackType() <= TrackDownDateEnums.B.getId()) {
  351 + map.put("bookbuild", 2);
  352 + }
  353 + }
  354 +
  355 + if ((int) map.get("cqsc") == 3) {//产前筛查
  356 + //如果当前流程已经结束流程，则显示X
  357 + if (trackDownRecord.getTrackType() <= TrackDownDateEnums.C.getId()) {
  358 + map.put("cqsc", 2);
  359 + }
  360 + }
  361 +
  362 + if ((int) map.get("fm") == 3) {//分娩
  363 + //如果当前流程已经结束流程，则显示X
  364 + if (trackDownRecord.getTrackType() <= TrackDownDateEnums.E.getId()) {
  365 + map.put("fm", 2);
  366 + }
  367 + }
  368 +
  369 + if ((int) map.get("chfc") == 3) {//产后复查
  370 + //如果当前流程已经结束流程，则显示X
  371 + if (trackDownRecord.getTrackType() <= TrackDownDateEnums.F.getId()) {
  372 + map.put("chfc", 2);
  373 + }
  374 + }
  375 +
  376 + if ((int) map.get("check") == 3) {//婚检
  377 + //如果当前流程已经结束流程，则显示X
  378 + if (trackDownRecord.getTrackType() <= TrackDownDateEnums.A.getId()) {
  379 + map.put("check", 2);
  380 + }
358 381 }
359 382 }
360 383 }