代码修改

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prenatalInspector/PrenatalInspectorPreCardService.java

@@ -128,6 +128,7 @@ public class PrenatalInspectorPreCardService extends BaseService {
                data = json.getJSONObject("data").getJSONArray("DATA");
            }
            Map<String, String> map = new HashMap<>();//存储产检号,用于去除预建卡信息中重复记录
            Map<String, String> mensesLastMap = new HashMap<>();//末次月经,用于去除预建卡信息中重复记录
            if (data != null && data.size() > 0) {//有建卡信息
                for (int i = 0; i < data.size(); i++) {
                    JSONObject planJson = new JSONObject();
@@ -148,7 +149,8 @@ public class PrenatalInspectorPreCardService extends BaseService {
                    planJson.put("mensesLast", MENSES_LAST);
                    planJson.put("expectedTime", EXPECTED_TIME);
                    Date date = new Date();
                    map.put("PREGNANCY_NO", "PREGNANCY_NO");
                    map.put(PREGNANCY_NO, PREGNANCY_NO);
                    mensesLastMap.put(MENSES_LAST, MENSES_LAST);
                    if (StringUtils.isBlank(END_TIME)) {
                        checkFlag = checkFlag ? false : checkFlag;
                        //未结束妊娠，生成待产检计划
@@ -265,13 +267,13 @@ public class PrenatalInspectorPreCardService extends BaseService {
                            JSONObject planJson = new JSONObject();
                            JSONObject pregnancy = preData.getJSONObject(i);
                            String PREGNANCY_NO = pregnancy.getString("PREGNANCY_NO");//智业产检号
                            if (map.containsKey(PREGNANCY_NO)) {
                            String MENSES_LAST = pregnancy.getString("MENSES_LAST");//末次月经
                            if (map.containsKey(PREGNANCY_NO)||mensesLastMap.containsKey(MENSES_LAST)) {
                                continue;//去重
                            }
                            String END_MANNER = pregnancy.getString("END_MANNER");//妊娠终止方式
                            String END_TIME = pregnancy.getString("END_TIME");//结束妊娠
                            String MENSES_LAST = pregnancy.getString("MENSES_LAST");//末次月经
                            Date dueday = DateUtil.getDueDate(DateUtil.strToDateLong(MENSES_LAST));//预产期
                            planJson.put("pregnancyNo", PREGNANCY_NO);
                            planJson.put("pregnancyStatus", "0");