From b4d95216bb764fc8825184f71c65e63f36572b1b Mon Sep 17 00:00:00 2001
From: hanshaofeng <hanshaofeng@lymsh.com>
Date: Mon, 28 Nov 2016 17:36:44 +0800
Subject: [PATCH] permission2

---
 .../operate/web/controller/TestController.java     | 59 +++++++++++++++++-----
 .../operate/web/service/SyncDataTaskService.java   | 11 +++-
 2 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
index 45c7885..6affa4d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
@@ -9,6 +9,7 @@ import com.lyms.platform.biz.service.SieveService;
 import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.JsonUtil;
+import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.operate.web.service.SyncDataTaskService;
 import com.lyms.platform.permission.service.OrganizationService;
 import com.lyms.platform.pojo.AntExChuModel;
@@ -203,18 +204,6 @@ public class TestController {
         return "assayconfiginit";
     }
 
-    public static void main(String[] a) {
-        try {
-            String json = FileUtils.readFileToString(new File("d:/assayconfig.json"));
-            List<AssayConfig> list = JsonUtil.toList(json, AssayConfig.class);
-            for (AssayConfig config:list) {
-                System.out.println(JsonUtil.obj2JsonString(config));
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
     @RequestMapping(value = "/updateXY", method = RequestMethod.GET)
     @ResponseBody
     public String updateXY() {
@@ -343,4 +332,50 @@ public class TestController {
         return "syncPatNextTime finish";
     }
 
+    @RequestMapping(value = "/initCardNo", method = RequestMethod.GET)
+    @ResponseBody
+    public String initCardNo() {
+        PatientsQuery query = new PatientsQuery();
+        query.setYn(1);
+        query.setHospitalId("216");
+        List<Patients> list = patientsService.queryPatient(query);
+        int a = 0;
+        for (Patients patients:list) {
+            if (org.apache.commons.lang.StringUtils.isBlank(patients.getCardNo())) {
+                Patients db = new Patients();
+                db.setId(patients.getId());
+                db.setCardNo(patients.getPhone());
+                db.setHcertificateTypeId("hcertificateTypeId");
+                patientsService.updatePatient(db);
+                a++;
+            }
+        }
+        return "initCardNo finish - " + a;
+    }
+
+    public static void main(String[] a) {
+        try {
+            List<String> list = FileUtils.readLines(new File("D:\\temp\\qhdfy_lost1.csv"));
+            List<String> linenums = new ArrayList<>();
+            for (String line:list) {
+                String ss[] = line.split(",");
+                if (ss.length > 0 && ss[0].trim().length() > 0) {
+                    linenums.add(ss[0].trim());
+                }
+            }
+            List<String> list1 = FileUtils.readLines(new File("D:\\temp\\qhd-jd.csv"), "utf-8");
+            StringBuffer sb = new StringBuffer();
+            for (String line:list1) {
+                String ss[] = line.split(",");
+                if (ss.length > 0 && ss[0].trim().length() > 0 && linenums.contains(ss[0].trim())) {
+                    sb.append(line);
+                    sb.append("\r\n");
+                }
+            }
+            FileUtils.writeStringToFile(new File("d:\\temp\\qhdfy_lost_data.csv"), sb.toString());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java
index 2e9c2bd..7368949 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java
@@ -480,7 +480,9 @@ public class SyncDataTaskService {
                 }
                 try {
                     int tempIndex = line.indexOf(",,,,,,,,,,,,,,,");
-                    line = line.substring(0, tempIndex + 1);
+                    if (tempIndex > 20) {
+                        line = line.substring(0, tempIndex + 1);
+                    }
                     String ss[] = line.split(",");
                     if (!ss[1].startsWith("2016")) {
                         continue;
@@ -728,6 +730,13 @@ public class SyncDataTaskService {
                         }
                         continue;
                     }
+                    if (patientsList.size() == 1) {
+                        patients.setId(patientsList.get(0).getId());
+                        personModel.setId(patients.getId());
+                        personService.updatePerson(personModel, personModel.getId());
+                        patientsService.updatePatient(patients);
+                        continue;
+                    }
                     personService.addPerson(personModel);
                     patientsService.addPatient(patients);
                     antenatalExaminationService.addOneAntEx(antExChuModel);
-- 
1.8.3.1