diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java index c1423af..769aaf0 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java @@ -1,10 +1,8 @@ package com.lyms.hospitalapi.Cdfy; import com.alibaba.fastjson.JSONObject; -import com.lyms.hospitalapi.pojo.HealthRecord; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.enums.PermissionTypeEnums; import com.lyms.platform.common.enums.RenShenJieJuEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; @@ -14,8 +12,6 @@ import com.lyms.platform.operate.web.facade.ViewFacade; import com.lyms.platform.operate.web.result.MatdeliverFollowResult; import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.operate.web.utils.FunvCommonUtil; -import com.lyms.platform.operate.web.utils.UnitConstants; -import com.lyms.platform.operate.web.utils.UnitUtils; import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.Users; @@ -25,16 +21,7 @@ import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; -import org.apache.commons.dbutils.DbUtils; -import org.apache.commons.dbutils.QueryRunner; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; -import org.apache.http.HttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.impl.conn.PoolingClientConnectionManager; -import org.apache.http.util.EntityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; @@ -43,8 +30,9 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Service; import java.sql.*; -import java.sql.Date; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * Created by Administrator on 2018/6/25. @@ -147,7 +135,7 @@ public class CdGwInterface { conn = ConnTools.makeGwConnection(); //个人基本信息语句 - String inBaseInfoSql = "insert into baseinfo(ORG_CODE,PATIENT_ID,CARD_NO,CARD_TYPE_CODE,NAME,\n" + + String inBaseInfoSql = "insert into BASEINFO(ORG_CODE,PATIENT_ID,CARD_NO,CARD_TYPE_CODE,NAME,\n" + "SEX_CODE,BIRTH_DATE,ID_TYPE_CODE,ID_NO,EMPLOYER_NAME,TEL_NO,\n" + "CONTACT_NAME,CONTACT_TEL_NO,NATIONALITY_CODE,ABO_CODE,RH_CODE,\n" + "EDUCATION_CODE,OCCUPATION_CODE,MARRIAGE_CODE,DRUG_ALLERGY_MARK,OP_HISTORY_MARK,TRAUMA_HISTORY_MARK,\n" + @@ -155,12 +143,12 @@ public class CdGwInterface { "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; //地址信息语句，01：户籍地址 - String inAddressSql01 = "insert into baseinfo_address(ORG_CODE,PATIENT_ID,Address_Type_Code,Addr_Province,Addr_City,\n" + + String inAddressSql01 = "insert into BASEINFO_ADDRESS(ORG_CODE,PATIENT_ID,Address_Type_Code,Addr_Province,Addr_City,\n" + "Addr_County,Addr_Town,Addr_Village,Addr_House_No,Postal_Code,DELETE_MARK,LAST_UPDATE_DTIME) \n" + "values(?,?,?,?,?,?,?,?,?,?,?,?)"; //地址信息语句，03：居住地址 - String inAddressSql03 = "insert into baseinfo_address(ORG_CODE,PATIENT_ID,Address_Type_Code,Addr_Province,Addr_City,\n" + + String inAddressSql03 = "insert into BASEINFO_ADDRESS(ORG_CODE,PATIENT_ID,Address_Type_Code,Addr_Province,Addr_City,\n" + "Addr_County,Addr_Town,Addr_Village,Addr_House_No,Postal_Code,DELETE_MARK,LAST_UPDATE_DTIME) \n" + "values(?,?,?,?,?,?,?,?,?,?,?,?)"; @@ -820,7 +808,15 @@ public class CdGwInterface { ps.setString(47, "未见异常"); } if(antExChuModel.getXhdb() != null){ - ps.setInt(48, Integer.parseInt(antExChuModel.getXhdb())); + int xh = 0; + try { + String xhdb = antExChuModel.getXhdb(); + double v = Double.parseDouble(xhdb); + xh = (int) v; + } catch (Exception e) { + e.printStackTrace(); + } + ps.setInt(48, xh); }else{ ps.setNull(48,Types.INTEGER); } @@ -1293,8 +1289,14 @@ public class CdGwInterface { }else{ ps.setNull(14,Types.INTEGER); } - if(antenatalExaminationModel.getUrineProtein() != null){ - ps.setDouble(15, Double.parseDouble(antenatalExaminationModel.getUrineProtein())); + if(antenatalExaminationModel.getUrineProtein() != null && !"-".equals(antenatalExaminationModel.getUrineProtein())){ + Double parseDouble = null; + try { + parseDouble = Double.parseDouble(antenatalExaminationModel.getUrineProtein()); + }catch (Exception e){ + e.printStackTrace(); + } + ps.setDouble(15, parseDouble); }else{ ps.setNull(15,Types.DOUBLE); } @@ -1649,7 +1651,13 @@ public class CdGwInterface { ps.setString(56,null); } if(data.getNeedleNum() != null){ - ps.setInt(57,Integer.parseInt(data.getNeedleNum())); + Integer needleNum = null; + try { + needleNum = Integer.parseInt(data.getNeedleNum()); + } catch (Exception e) { + e.printStackTrace(); + } + ps.setInt(57,needleNum); }else{ ps.setNull(57,Types.INTEGER); } @@ -4020,11 +4028,15 @@ public class CdGwInterface { saveEb(startDate, endDate); } - - public void test(String startDate,String endDate) { - System.out.println("start=" + startDate + "end=" + endDate); + /** + * 测试专用 + * + * @param startDate + * @param endDate + */ + public BaseResponse testAll(String startDate,String endDate) { saveYf(startDate, endDate); - saveChuZhen(startDate, endDate); + saveChuZhen(startDate, endDate); saveFuZhen(startDate, endDate); saveFm(startDate, endDate); saveChFs(startDate, endDate); @@ -4032,6 +4044,7 @@ public class CdGwInterface { saveEtDa(startDate, endDate); saveXsrFs(startDate, endDate); saveEb(startDate, endDate); + return new BaseResponse(); } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterfaceDebug.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterfaceDebug.java new file mode 100644 index 0000000..fadfa75 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterfaceDebug.java @@ -0,0 +1,61 @@ +package com.lyms.hospitalapi.Cdfy; + +import com.lyms.platform.common.result.BaseResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * + * @Author dongqin + * @Description 承德公共卫生系统接口（gxk）测试专用 + * @Date 16:04 2019/6/24 + */ +@Controller +public class CdGwInterfaceDebug { + + @Autowired + private CdGwInterface cdGwInterface; + + /** + * 起止时间需注意mongdn的时差问题 + * + * @param startTime + * @param endTime + * @return + */ + @RequestMapping(value = "/sync/test",method = RequestMethod.GET) + private BaseResponse test(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime, @RequestParam(required = false) String typeStr){ + System.out.printf("start = %s , end = %s , typeStr = %s", startTime, endTime, typeStr); + if ("saveYf".equals(typeStr)) { + return cdGwInterface.saveYf(startTime, endTime); + } + if ("saveChuZhen".equals(typeStr)) { + return cdGwInterface.saveChuZhen(startTime, endTime); + } + if ("saveFuZhen".equals(typeStr)) { + return cdGwInterface.saveFuZhen(startTime, endTime); + } + if ("saveFm".equals(typeStr)) { + return cdGwInterface.saveFm(startTime, endTime); + } + if ("saveChFs".equals(typeStr)) { + return cdGwInterface.saveChFs(startTime, endTime); + } + if ("saveEtDa".equals(typeStr)) { + return cdGwInterface.saveEtDa(startTime, endTime); + } + if ("saveXsrFs".equals(typeStr)) { + return cdGwInterface.saveXsrFs(startTime, endTime); + } + if ("saveEb".equals(typeStr)) { + return cdGwInterface.saveEb(startTime, endTime); + } + if ("all".equals(typeStr)) { + return cdGwInterface.testAll(startTime, endTime); + } + return new BaseResponse(); + } +}