Commit 53f75f51bb9195d78eec2981d214bb07f2cecbe2

Authored by wtt
1 parent 0a7ea4f6ba

Merge branch 'master' of E:\lymsWtt\idea\idea_coder1\regional-platform with conflicts.

Showing 4 changed files with 513 additions and 462 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java View file @ 53f75f5
Diff suppressed. Click to show
... ... @@ -82,12 +82,14 @@
82 82 */
83 83 public String getPersonId(Patients patient)
84 84 {
  85 + System.out.println("3.8.1 如果有档案返回id 没有就创建档案调用接口,姓名、身份证号码打印:"+patient.getUsername()+" / "+patient.getCardNo());
85 86 String id = findPersonInfoCardNo(patient.getUsername(), patient.getCardNo());
86 87 if (id == null)
87 88 {
88 89 MaternalInfo maternalInfo = covertMaternalInfo(patient);
89 90 String param = JsonUtil.obj2Str(maternalInfo);
90 91 id = saveMaternalInfo(param);
  92 + System.out.println("3.8.2 调用冠新接口获取personInfoId,id打印:"+id);
91 93 }
92 94 return id;
93 95 }
... ... @@ -119,6 +121,7 @@
119 121  
120 122 if (patient == null || StringUtils.isEmpty(patient.getTownOrgId()))
121 123 {
  124 + System.out.println("3.1 乡镇卫生机构id为空");
122 125 br.setErrorcode(-1);
123 126 br.setErrormsg("乡镇卫生机构id为空");
124 127 return br;
125 128  
... ... @@ -127,7 +130,10 @@
127 130 PreparedStatement ps = null;
128 131 ResultSet rs = null;
129 132 try {
  133 + System.out.println("3.2 start 根据身份证号查询在公共卫生的ID是否存在");
130 134 String id= getPersonId(patient);
  135 + System.out.println("3.2 end 根据身份证号查询在公共卫生的ID是否存在 ,id打印:"+id);
  136 +
131 137 System.out.println("saveBaseInfo id = "+id);
132 138 if (id != null)
133 139 {
... ... @@ -192,7 +198,7 @@
192 198 MaternalInfo maternalInfo = new MaternalInfo();
193 199 getNation(patient.getPnationId(),maternalInfo);
194 200  
195   -
  201 + System.out.println("3.3 执行插入个人基本信息表 , sql打印:"+inBaseInfoSql);
196 202 //执行插入个人基本信息表(BASEINFO)
197 203 ps = conn.prepareStatement(inBaseInfoSql);
198 204 ps.setString(1,code);
... ... @@ -227,6 +233,7 @@
227 233  
228 234 int inResult = ps.executeUpdate();
229 235 if (inResult > 0) {
  236 + System.out.println("3.4 地址信息插入--户籍地址(3.3成功后),sql打印:"+inAddressSql01);
230 237 ps = conn.prepareStatement(inAddressSql01);
231 238 ps.setString(1,code);
232 239 ps.setString(2,id);
... ... @@ -243,6 +250,7 @@
243 250  
244 251 int adress01 = ps.executeUpdate();
245 252 if (adress01 > 0) {
  253 + System.out.println("3.5 地址信息插入--居住地址(3.4成功后),sql打印:"+inAddressSql03);
246 254 ps = conn.prepareStatement(inAddressSql03);
247 255 ps.setString(1,code);
248 256 ps.setString(2,id);
... ... @@ -259,6 +267,8 @@
259 267  
260 268 int adress03 = ps.executeUpdate();
261 269 if (adress03 > 0) {
  270 + System.out.println("3.6 地址信息插入--产后居住地(3.5成功后),sql打印:"+inAddressSql07);
  271 +
262 272 ps = conn.prepareStatement(inAddressSql07);
263 273 ps.setString(1,code);
264 274 ps.setString(2,id);
... ... @@ -305,6 +315,7 @@
305 315 ExceptionUtils.catchException(e,"save base info error.");
306 316 }
307 317 finally {
  318 + System.out.println("3.7 基本信息以及地址信息,结束。。。。。。。。。。。。。。");
308 319 close(conn, ps, rs);
309 320 }
310 321 return br;
311 322  
... ... @@ -541,7 +552,9 @@
541 552 String creatorId = "";
542 553  
543 554 try{
  555 + System.out.println("3.1 通过建档id 获取建档信息");
544 556 Patients patients = getMainPatient(antExChuModel.getParentId());
  557 + System.out.println("3.1.1 patients == null || StringUtils.isEmpty(patients.getTownOrgId()) 状态打印:"+patients == null || StringUtils.isEmpty(patients.getTownOrgId()));
545 558 if (patients == null || StringUtils.isEmpty(patients.getTownOrgId()))
546 559 {
547 560 return null;
... ... @@ -550,6 +563,7 @@
550 563 //居住地址
551 564 String liveAddress = CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(),
552 565 patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService);
  566 + System.out.println("3.2 获取孕妇居住地址:"+liveAddress);
553 567  
554 568 Organization organization = organizationService.getOrganization(Integer.parseInt(patients.getTownOrgId()));
555 569  
... ... @@ -564,6 +578,7 @@
564 578 //String hospital =basic.getName();
565 579  
566 580 String code = basic.getCode();//getCodeByHospital(hospital);
  581 + System.out.println("3.3 智业中间库的医疗机构编码,打印:"+code);
567 582  
568 583 Map<String,String> gxMap = findGxHospitalById(organization.getTownOrgId());
569 584 if(gxMap != null){
570 585  
571 586  
572 587  
573 588  
574 589  
575 590  
... ... @@ -571,27 +586,32 @@
571 586 orgName = gxMap.get("orgName");
572 587 creator = gxMap.get("creator");
573 588 creatorId = gxMap.get("creatorId");
  589 + System.out.println("3.4 根据机构id查询,冠新对应的机构ID和名称和录入人ID姓名,打印:"+" createOrgId="+createOrgId+" ,orgName="+orgName+" , creator="+creator+" , creatorId="+creatorId);
  590 +
574 591 }else{
  592 + System.out.println("3.4 获取失败。。。。");
575 593 return null;
576 594 }
577   -
  595 + System.out.println("3.5 通过初诊id,获取初证json数据,初诊id打印:"+antExChuModel.getId());
578 596 BaseObjectResponse br = viewFacade.findAntExChu(antExChuModel.getId());
579 597  
580 598 if (br.getData() != null && patients != null) {
581 599  
582 600 if(StringUtils.isNotEmpty(patients.getId()) && StringUtils.isNotEmpty(antExChuModel.getId())) {
583   -
  601 + System.out.println("3.6 初诊json数据获取成功");
584 602 //根据病人ID和初诊ID删除数据
585 603 String delSql = "delete from WOMAN_PREFIRSTVISIT where \n" +
586 604 "PREN_VISIT_FORM_NO=\'" + antExChuModel.getId() + "\'";
587 605 deleteData(delSql, conn, ps);
  606 + System.out.println("3.7 根据初证id删除,承德公卫初证信息,删除语句打印:"+delSql);
588 607  
589 608 //插入数据
590 609 Map<String, Object> map = (Map) br.getData();
591   -
  610 + System.out.println("3.8 (一般基本信息同步过,这里有id,3.8.2不会打印。)如果有档案返回id 没有就创建档案调用接口,根据身份证号查询在公共卫生的ID是否存在。。。。");
592 611 String id = getPersonId(patients);
593 612 if (id == null)
594 613 {
  614 + System.out.println("3.8 异常。。。。");
595 615 return br;
596 616 }
597 617  
598 618  
... ... @@ -603,57 +623,9 @@
603 623 "orgName,creator,creator_Id) " +
604 624 "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
605 625 ps = conn.prepareStatement(inSqlDiag);
606   - ps.setDate(1, new Date(antExChuModel.getModified().getTime()));
607   - ps.setString(2, code);
608   - ps.setString(3, id);
609   - ps.setString(4, antExChuModel.getId());
610   - ps.setString(5, patients.getUsername());
611   - ps.setString(6, liveAddress);
612   - ps.setString(7, patients.getPhone());
613   - ps.setString(8, patients.getPworkUnit());
614   - if(antExChuModel.getWeight() != null){
615   - ps.setDouble(9, Double.parseDouble(antExChuModel.getWeight()));
616   - }else{
617   - ps.setNull(9, Types.DOUBLE);
618   - }
619   - ps.setDate(10,new Date(antExChuModel.getLastMenses().getTime()));
620   - ps.setDate(11, new Date(patients.getDueDate().getTime()));
621   - if(antExChuModel.getPregnancyTimes() != null){
622   - ps.setInt(12, antExChuModel.getPregnancyTimes());
623   - }else{
624   - ps.setNull(12,Types.INTEGER);
625   - }
626   - if(antExChuModel.getProdTime() != null){
627   - ps.setInt(13, antExChuModel.getProdTime());
628   - }else{
629   - ps.setNull(13,Types.INTEGER);
630   - }
631   - if(antExChuModel.getAbortionZR() != null){
632   - ps.setInt(14, antExChuModel.getAbortionZR());
633   - }else{
634   - ps.setNull(14,Types.INTEGER);
635   - }
636   - if(antExChuModel.getAbortionRG() != null){
637   - ps.setInt(15, antExChuModel.getAbortionRG());
638   - }else{
639   - ps.setNull(15,Types.INTEGER);
640   - }
641   - ps.setString(16, patients.getHusbandName());
642   - if(antExChuModel.getCheckTime() != null){
643   - ps.setDate(17, new Date(antExChuModel.getCheckTime().getTime()));
644   - }else{
645   - ps.setNull(17,Types.DATE);
646   - }
647   - if(patients.getBookbuildingDate() != null){
648   - ps.setDate(18,new Date(patients.getBookbuildingDate().getTime()));
649   - }else{
650   - ps.setNull(18,Types.DATE);
651   - }
652   - ps.setString(19,createOrgId);
653   - ps.setString(20,orgName);
654   - ps.setString(21,creator);
655   - ps.setString(22,creatorId);
  626 + psInSqlDiag(antExChuModel, ps, createOrgId, orgName, creator, creatorId, patients, liveAddress, code, id);
656 627 ps.executeUpdate();
  628 + System.out.println("3.9 冠鑫孕产登记,更新(和基本信息接口数据是一样的,就差几个“地址信息语句”),sql打印:"+inSqlDiag);
657 629  
658 630  
659 631 String inSql = "insert into WOMAN_PREFIRSTVISIT(LAST_UPDATE_DTIME,ORG_CODE,PATIENT_ID,PREN_VISIT_FORM_NO,\n" +
660 632  
... ... @@ -673,401 +645,11 @@
673 645 "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,\n" +
674 646 "?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
675 647  
676   - ps = conn.prepareStatement(inSql);
677   - ps.setDate(1, new Date(antExChuModel.getModified().getTime()));
678   - ps.setString(2, code);
679   - ps.setString(3, id);
680   - ps.setString(4, antExChuModel.getId());
681   - ps.setString(5, antExChuModel.getId());
682   - ps.setString(6, patients.getUsername());
683   - ps.setDate(7, new Date(antExChuModel.getCreated().getTime()));
684   - if (null != patients.getLastMenses()) {
685   - int days = DateUtil.daysBetween(patients.getLastMenses(), new java.util.Date());
686   - ps.setInt(8, days / 7);
687   - } else {
688   - ps.setNull(8, Types.INTEGER);
689   - }
690   - ps.setDate(9, new Date(patients.getBirth().getTime()));
691   - ps.setString(10, patients.getHusbandName());
692   - ps.setString(11, patients.getHusbandPhone());
693   - if(patients.getHusbandBirth() != null){
694   - ps.setDate(12, new Date(patients.getHusbandBirth().getTime()));
695   - }else{
696   - ps.setNull(12,Types.DATE);
697   - }
698   - if(antExChuModel.getPregnancyTimes() != null){
699   - ps.setInt(13, antExChuModel.getPregnancyTimes());
700   - }else{
701   - ps.setNull(13,Types.INTEGER);
702   - }
703   - if(antExChuModel.getProdTime() != null){
704   - ps.setInt(14, antExChuModel.getProdTime());
705   - }else{
706   - ps.setNull(14,Types.INTEGER);
707   - }
708   - if(antExChuModel.getDelivery() != null){
709   - ps.setInt(15, antExChuModel.getDelivery());
710   - }else{
711   - ps.setNull(15,Types.INTEGER);
712   - }
713   - if(antExChuModel.getPlanedProd() != null){
714   - ps.setInt(16, antExChuModel.getPlanedProd());
715   - }else{
716   - ps.setNull(16,Types.INTEGER);
717   - }
718   - ps.setString(17, "1");
719   - ps.setDate(18, new Date(antExChuModel.getLastMenses().getTime()));
720   - if(patients.getDueDate() != null){
721   - ps.setDate(19, new Date(patients.getDueDate().getTime()));
722   - }else{
723   - ps.setNull(19,Types.DATE);
724   - }
725   - ps.setString(20, "0");
726   - ps.setString(21, "无");
727   - ps.setString(22, "无");
728   - if(antExChuModel.getAbortion() != null){
729   - ps.setInt(23, antExChuModel.getAbortion());
730   - }else{
731   - ps.setNull(23,Types.INTEGER);
732   - }
733   - if(antExChuModel.getStillChan() != null){
734   - ps.setInt(24, antExChuModel.getStillChan());
735   - }else{
736   - ps.setNull(24,Types.INTEGER);
737   - }
738   - if(antExChuModel.getStillbirth() != null){
739   - ps.setInt(25, antExChuModel.getStillbirth());
740   - }else{
741   - ps.setNull(25,Types.INTEGER);
742   - }
743   - if(antExChuModel.getNeoDeath() != null){
744   - ps.setInt(26, antExChuModel.getNeoDeath());
745   - }else{
746   - ps.setNull(26,Types.INTEGER);
747   - }
748   - if(antExChuModel.getBirthDefect() != null){
749   - ps.setInt(27, antExChuModel.getBirthDefect());
750   - }else{
751   - ps.setNull(27,Types.INTEGER);
752   - }
753   - if(antExChuModel.getHeight() != null){
754   - ps.setDouble(28, Double.parseDouble(antExChuModel.getHeight()));
755   - }else{
756   - ps.setNull(28, Types.DOUBLE);
757   - }
758   - if(antExChuModel.getWeight() != null){
759   - ps.setDouble(29, Double.parseDouble(antExChuModel.getWeight()));
760   - }else{
761   - ps.setNull(29, Types.DOUBLE);
762   - }
763   - //体质指数(体重除以身高的平方(米的平方))
764   - //身高米的平方
765   - if(antExChuModel.getHeight() != null){
766   - Double wh = Double.parseDouble(antExChuModel.getHeight()) / 100;
767   - Double shen = wh * wh;
768   - Double bmi = Double.parseDouble(antExChuModel.getWeight()) / shen;
769   - ps.setDouble(30, bmi);
770   - }else{
771   - ps.setNull(30, Types.DOUBLE);
772   - }
773   - ps.setNull(31, Types.INTEGER);
774   - ps.setNull(32, Types.INTEGER);
775   - ps.setString(33, null);
776   - ps.setString(34, null);
777   - ps.setString(35, antExChuModel.getLungs());
778   - ps.setString(36, null);
779   - ps.setString(37, antExChuModel.getHeart());
780   - if (!"2".equals(antExChuModel.getVulvaSele())) {
781   - ps.setString(38, "1");
782   - ps.setString(39, antExChuModel.getVulva());
783   - } else {
784   - ps.setString(38, "0");
785   - ps.setString(39, "未见异常");
786   - }
787   - if (!"2".equals(antExChuModel.getVaginaSele())) {
788   - ps.setString(40, "1");
789   - ps.setString(41, antExChuModel.getVagina());
790   - } else {
791   - ps.setString(40, "0");
792   - ps.setString(41, "未见异常");
793   - }
794   - if (!"2".equals(antExChuModel.getCervicalSele())) {
795   - ps.setString(42, "1");
796   - ps.setString(43, antExChuModel.getCervical());
797   - } else {
798   - ps.setString(42, "0");
799   - ps.setString(43, "未见异常");
800   - }
801   - ps.setString(44, "0");
802   - ps.setString(45, "未见异常");
803   - if (!"2".equals(antExChuModel.getFujianSele())) {
804   - ps.setString(46, "1");
805   - ps.setString(47, antExChuModel.getFujian());
806   - } else {
807   - ps.setString(46, "0");
808   - ps.setString(47, "未见异常");
809   - }
810   - if(antExChuModel.getXhdb() != null){
811   - int xh = 0;
812   - try {
813   - String xhdb = antExChuModel.getXhdb();
814   - double v = Double.parseDouble(xhdb);
815   - xh = (int) v;
816   - } catch (Exception e) {
817   - e.printStackTrace();
818   - }
819   - ps.setInt(48, xh);
820   - }else{
821   - ps.setNull(48,Types.INTEGER);
822   - }
823   - if(antExChuModel.getBxbjs() != null){
824   - ps.setDouble(49, Double.parseDouble(antExChuModel.getBxbjs()));
825   - }else{
826   - ps.setNull(49,Types.DOUBLE);
827   - }
828   - if(antExChuModel.getPlatelet() != null){
829   - if (StringUtils.isNumeric(antExChuModel.getPlatelet()))
830   - {
831   - ps.setDouble(50, Double.parseDouble(antExChuModel.getPlatelet()));
832   - }
  648 + ps = conn.prepareStatement(inSql);
  649 + psInSql(antExChuModel, ps, createOrgId, orgName, creator, creatorId, patients, code, map, id);
  650 + ps.executeUpdate();
  651 + System.out.println("3.10 (初诊) WOMAN_PREFIRSTVISIT ,更新,sql打印:"+ inSql);
833 652  
834   - }else{
835   - ps.setNull(50,Types.INTEGER);
836   - }
837   - if(antExChuModel.getNdb() != null){
838   - boolean b = false;
839   - b = isDouble(antExChuModel.getNdb());
840   - if(b){
841   - ps.setDouble(51, Double.parseDouble(antExChuModel.getNdb()));
842   - }else{
843   - ps.setNull(51, Types.DOUBLE);
844   - }
845   - }else{
846   - ps.setNull(51,Types.DOUBLE);
847   - }
848   - ps.setString(52, null);
849   - ps.setString(53, null);
850   - if(antExChuModel.getNt() != null){
851   - boolean bo =false;
852   - bo = isDouble(antExChuModel.getNt());
853   - if(bo){
854   - ps.setDouble(54, Double.parseDouble(antExChuModel.getNt()));
855   - }else{
856   - ps.setNull(54,Types.DOUBLE);
857   - }
858   - }else{
859   - ps.setNull(54,Types.DOUBLE);
860   - }
861   - ps.setString(55, null);
862   - ps.setString(56, null);
863   - if(antExChuModel.getAbo() != null){
864   - String xx = FunvCommonUtil.getBaseicConfigByid(antExChuModel.getAbo(), basicConfigService);
865   - if(xx.equals("A")){
866   - ps.setString(57,"1");
867   - }else if(xx.equals("B")){
868   - ps.setString(57,"2");
869   - }else if(xx.equals("O")){
870   - ps.setString(57,"3");
871   - }else if(xx.equals("AB")){
872   - ps.setString(57,"4");
873   - }else{
874   - ps.setString(57,"5");
875   - }
876   - }else{
877   - ps.setString(57, null);
878   - }
879   - if(antExChuModel.getRh() != null){
880   - if(antExChuModel.getRh().equals("yang")){
881   - ps.setString(58, "2");
882   - }else if(antExChuModel.getRh().equals("yin")){
883   - ps.setString(58, "1");
884   - }else{
885   - ps.setString(58, "3");
886   - }
887   - }else{
888   - ps.setString(58, null);
889   - }
890   - if(antExChuModel.getBloodSugar() != null){
891   - ps.setDouble(59, Double.parseDouble(antExChuModel.getBloodSugar()));
892   - }else{
893   - ps.setNull(59,Types.DOUBLE);
894   - }
895   - if(antExChuModel.getXqgbzam() != null){
896   - ps.setDouble(60, Double.parseDouble(antExChuModel.getXqgbzam()));
897   - }else{
898   - ps.setNull(60,Types.DOUBLE);
899   - }
900   - if(antExChuModel.getXqgczam() != null){
901   - ps.setDouble(61, Double.parseDouble(antExChuModel.getXqgczam()));
902   - }else{
903   - ps.setNull(61,Types.DOUBLE);
904   - }
905   - if(antExChuModel.getAlbumin() != null){
906   - ps.setDouble(62, Double.parseDouble(antExChuModel.getAlbumin()));
907   - }else{
908   - ps.setNull(62,Types.DOUBLE);
909   - }
910   - if(antExChuModel.getTotalBilirubin() != null){
911   - ps.setDouble(63, Double.parseDouble(antExChuModel.getTotalBilirubin()));
912   - }else{
913   - ps.setNull(63,Types.DOUBLE);
914   - }
915   - if(antExChuModel.getJhBilirubin() != null){
916   - ps.setDouble(64, Double.parseDouble(antExChuModel.getJhBilirubin()));
917   - }else{
918   - ps.setNull(64,Types.DOUBLE);
919   - }
920   - if(antExChuModel.getXnsd() != null){
921   - ps.setDouble(65, Double.parseDouble(antExChuModel.getXnsd()));
922   - }else{
923   - ps.setNull(65,Types.DOUBLE);
924   - }
925   - if(antExChuModel.getXqjq() != null){
926   - ps.setDouble(66, Double.parseDouble(antExChuModel.getXqjq()));
927   - }else{
928   - ps.setNull(66,Types.DOUBLE);
929   - }
930   - if (map.get("ydfmw") != null) {
931   - if("未见异常".equals(map.get("ydfmw").toString())){
932   - ps.setString(67, "1");
933   - }else if("滴虫".equals(map.get("ydfmw").toString())){
934   - ps.setString(67, "2");
935   - }else if("假丝酵母菌".equals(map.get("ydfmw").toString())){
936   - ps.setString(67,"3");
937   - }else{
938   - ps.setString(67,"9");
939   - }
940   - } else {
941   - ps.setString(67, null);
942   - }
943   -
944   - if (map.get("ydqjd") != null) {
945   - if("Ⅰ度".equals(map.get("ydqjd").toString())){
946   - ps.setString(68, "1");
947   - }else if("Ⅱ度".equals(map.get("ydqjd").toString())){
948   - ps.setString(68, "2");
949   - }else if("Ⅲ度".equals(map.get("ydqjd").toString())){
950   - ps.setString(68,"3");
951   - }else if("Ⅳ度".equals(map.get("ydqjd").toString())){
952   - ps.setString(68,"4");
953   - }else{
954   - ps.setString(68, null);
955   - }
956   - } else {
957   - ps.setString(68, null);
958   - }
959   - if (map.get("ygekt") != null) {
960   - if("+".equals(map.get("ygekt").toString())){
961   - ps.setString(69,"2");
962   - }else if("-".equals(map.get("ygekt").toString())){
963   - ps.setString(69,"1");
964   - }else{
965   - ps.setString(69, null);
966   - }
967   - } else {
968   - ps.setString(69, null);
969   - }
970   -
971   - if (map.get("ygeky") != null) {
972   - if("+".equals(map.get("ygeky").toString())){
973   - ps.setString(70, "2");
974   - }else if("-".equals(map.get("ygeky").toString())){
975   - ps.setString(70,"1");
976   - }else{
977   - ps.setString(70, null);
978   - }
979   -
980   - } else {
981   - ps.setString(70, null);
982   - }
983   - if (map.get("ygbmkt") != null) {
984   - if("+".equals(map.get("ygbmkt").toString())){
985   - ps.setString(71, "2");
986   - }else if("-".equals(map.get("ygbmkt").toString())){
987   - ps.setString(71,"1");
988   - }else{
989   - ps.setString(71, null);
990   - }
991   - } else {
992   - ps.setString(71, null);
993   - }
994   - if (map.get("ygbmky") != null) {
995   - if("+".equals(map.get("ygbmky").toString())){
996   - ps.setString(72, "2");
997   - }else if("-".equals(map.get("ygbmky").toString())){
998   - ps.setString(72, "1");
999   - }else{
1000   - ps.setString(72, null);
1001   - }
1002   - } else {
1003   - ps.setString(72, "3");
1004   - }
1005   - if (map.get("yghxkt") != null) {
1006   - if("+".equals(map.get("yghxkt").toString())){
1007   - ps.setString(73, "2");
1008   - }else if("-".equals(map.get("yghxkt").toString())){
1009   - ps.setString(73, "1");
1010   - }else{
1011   - ps.setString(73, null);
1012   - }
1013   - } else {
1014   - ps.setString(73, null);
1015   - }
1016   - if (map.get("syjg") != null) {
1017   - if("+".equals(map.get("syjg").toString())){
1018   - ps.setString(74, "2");
1019   - }else if("-".equals(map.get("syjg").toString())){
1020   - ps.setString(74, "1");
1021   - }else{
1022   - ps.setString(74,null);
1023   - }
1024   - } else {
1025   - ps.setString(74, null);
1026   - }
1027   - if (map.get("hivkt") != null) {
1028   - if("+".equals(map.get("hivkt").toString())){
1029   - ps.setString(75, "2");
1030   - }else if("-".equals(map.get("hivkt").toString())){
1031   - ps.setString(75, "1");
1032   - }else{
1033   - ps.setString(75, null);
1034   - }
1035   - } else {
1036   - ps.setString(75, null);
1037   - }
1038   - ps.setString(76, antExChuModel.getbChao());
1039   - ps.setString(77, null);
1040   - if (map.get("diagnosis") != null) {
1041   - ps.setString(78, map.get("diagnosis").toString());
1042   - } else {
1043   - ps.setString(78, null);
1044   - }
1045   - ps.setString(79, null);
1046   - ps.setString(80, null);
1047   - ps.setString(81, null);
1048   - ps.setString(82, null);
1049   - if (map.get("checkDoctor") != null) {
1050   - ps.setString(83, map.get("checkDoctor").toString());
1051   - } else {
1052   - ps.setString(83, null);
1053   - }
1054   - if(antExChuModel.getCheckTime() != null){
1055   - ps.setDate(84, new Date(antExChuModel.getCheckTime().getTime()));
1056   - }else{
1057   - ps.setNull(84, Types.DATE);
1058   - }
1059   - if(antExChuModel.getNextCheckTime() != null){
1060   - ps.setDate(85, new Date(antExChuModel.getNextCheckTime().getTime()));
1061   - }else{
1062   - ps.setNull(85, Types.DATE);
1063   - }
1064   - ps.setString(86, null);
1065   - ps.setString(87,createOrgId);
1066   - ps.setString(88,orgName);
1067   - ps.setString(89,creator);
1068   - ps.setString(90,creatorId);
1069   - ps.executeUpdate();
1070   -
1071 653 try {
1072 654 //个人史
1073 655 if (!"无".equals(map.get("personalHistory").toString()) && StringUtils.isNotEmpty(antExChuModel.getPersonalHistory())
1074 656  
... ... @@ -1088,10 +670,11 @@
1088 670 ps.setString(5, "");
1089 671 }
1090 672 ps.executeUpdate();
  673 + System.out.println("3.11 个人史,保存,sql打印:"+inPerSql);
1091 674 }
1092 675 }catch (Exception e)
1093 676 {
1094   -
  677 + System.out.println("3.11 个人史,保存,异常。。。。。。。。");
1095 678 }
1096 679  
1097 680 try {
1098 681  
... ... @@ -1115,10 +698,11 @@
1115 698 ps.setString(7, null);
1116 699 }
1117 700 ps.executeUpdate();
1118   -
  701 + System.out.println("3.12 既往史,保存,sql打印:"+inPastSSql);
1119 702 }
1120 703 }catch (Exception e)
1121 704 {
  705 + System.out.println("3.12 既往史,保存,异常。。。。。。。。");
1122 706  
1123 707 }
1124 708  
1125 709  
1126 710  
... ... @@ -1139,12 +723,14 @@
1139 723 ps.setString(6, null);
1140 724 ps.setString(7, null);
1141 725 ps.executeUpdate();
1142   -
  726 + System.out.println("3.13 家族史,保存,sql打印:"+inFamSql);
1143 727 }
1144 728 }catch (Exception e)
1145 729 {
  730 + System.out.println("3.13 家族史,保存,异常。。。。。。。。");
1146 731  
1147 732 }
  733 + System.out.println("3.14 冠鑫孕产登记 、 (初诊) WOMAN_PREFIRSTVISIT 、 个人史 、 既往史 、 家族史,保存结束。。。。。。。。。");
1148 734 return br;
1149 735 }
1150 736  
1151 737  
1152 738  
1153 739  
1154 740  
... ... @@ -1152,16 +738,465 @@
1152 738  
1153 739 }catch (Exception e){
1154 740 ExceptionUtils.catchException(e, "saveWoman_Prefirstvisit error.");
  741 + System.out.println("3.14 冠鑫孕产登记 、 (初诊) WOMAN_PREFIRSTVISIT 、 个人史 、 既往史 、 家族史,保存异常、、、、、、、");
  742 +
1155 743 }finally {
1156 744 close(conn,ps,rs);
1157   -
  745 + System.out.println("3.15 结束。。。。。。。。。。");
1158 746 }
1159 747  
1160 748 return null;
1161 749 }
1162 750  
  751 + private void psInSql(AntExChuModel antExChuModel, PreparedStatement ps, String createOrgId, String orgName, String creator, String creatorId, Patients patients, String code, Map<String, Object> map, String id) throws SQLException {
  752 + ps.setDate(1, new Date(antExChuModel.getModified().getTime()));
  753 + ps.setString(2, code);
  754 + ps.setString(3, id);
  755 + ps.setString(4, antExChuModel.getId());
  756 + ps.setString(5, antExChuModel.getId());
  757 + ps.setString(6, patients.getUsername());
  758 + ps.setDate(7, new Date(antExChuModel.getCreated().getTime()));
  759 + if (null != patients.getLastMenses()) {
  760 + int days = DateUtil.daysBetween(patients.getLastMenses(), new java.util.Date());
  761 + ps.setInt(8, days / 7);
  762 + } else {
  763 + ps.setNull(8, Types.INTEGER);
  764 + }
  765 + ps.setDate(9, new Date(patients.getBirth().getTime()));
  766 + ps.setString(10, patients.getHusbandName());
  767 + ps.setString(11, patients.getHusbandPhone());
  768 + if(patients.getHusbandBirth() != null){
  769 + ps.setDate(12, new Date(patients.getHusbandBirth().getTime()));
  770 + }else{
  771 + ps.setNull(12,Types.DATE);
  772 + }
  773 + if(antExChuModel.getPregnancyTimes() != null){
  774 + ps.setInt(13, antExChuModel.getPregnancyTimes());
  775 + }else{
  776 + ps.setNull(13,Types.INTEGER);
  777 + }
  778 + if(antExChuModel.getProdTime() != null){
  779 + ps.setInt(14, antExChuModel.getProdTime());
  780 + }else{
  781 + ps.setNull(14,Types.INTEGER);
  782 + }
  783 + if(antExChuModel.getDelivery() != null){
  784 + ps.setInt(15, antExChuModel.getDelivery());
  785 + }else{
  786 + ps.setNull(15,Types.INTEGER);
  787 + }
  788 + if(antExChuModel.getPlanedProd() != null){
  789 + ps.setInt(16, antExChuModel.getPlanedProd());
  790 + }else{
  791 + ps.setNull(16,Types.INTEGER);
  792 + }
  793 + ps.setString(17, "1");
  794 + ps.setDate(18, new Date(antExChuModel.getLastMenses().getTime()));
  795 + if(patients.getDueDate() != null){
  796 + ps.setDate(19, new Date(patients.getDueDate().getTime()));
  797 + }else{
  798 + ps.setNull(19,Types.DATE);
  799 + }
  800 + ps.setString(20, "0");
  801 + ps.setString(21, "无");
  802 + ps.setString(22, "无");
  803 + if(antExChuModel.getAbortion() != null){
  804 + ps.setInt(23, antExChuModel.getAbortion());
  805 + }else{
  806 + ps.setNull(23,Types.INTEGER);
  807 + }
  808 + if(antExChuModel.getStillChan() != null){
  809 + ps.setInt(24, antExChuModel.getStillChan());
  810 + }else{
  811 + ps.setNull(24,Types.INTEGER);
  812 + }
  813 + if(antExChuModel.getStillbirth() != null){
  814 + ps.setInt(25, antExChuModel.getStillbirth());
  815 + }else{
  816 + ps.setNull(25,Types.INTEGER);
  817 + }
  818 + if(antExChuModel.getNeoDeath() != null){
  819 + ps.setInt(26, antExChuModel.getNeoDeath());
  820 + }else{
  821 + ps.setNull(26,Types.INTEGER);
  822 + }
  823 + if(antExChuModel.getBirthDefect() != null){
  824 + ps.setInt(27, antExChuModel.getBirthDefect());
  825 + }else{
  826 + ps.setNull(27,Types.INTEGER);
  827 + }
  828 + if(antExChuModel.getHeight() != null){
  829 + ps.setDouble(28, Double.parseDouble(antExChuModel.getHeight()));
  830 + }else{
  831 + ps.setNull(28, Types.DOUBLE);
  832 + }
  833 + if(antExChuModel.getWeight() != null){
  834 + ps.setDouble(29, Double.parseDouble(antExChuModel.getWeight()));
  835 + }else{
  836 + ps.setNull(29, Types.DOUBLE);
  837 + }
  838 + //体质指数(体重除以身高的平方(米的平方))
  839 + //身高米的平方
  840 + if(antExChuModel.getHeight() != null){
  841 + Double wh = Double.parseDouble(antExChuModel.getHeight()) / 100;
  842 + Double shen = wh * wh;
  843 + Double bmi = Double.parseDouble(antExChuModel.getWeight()) / shen;
  844 + ps.setDouble(30, bmi);
  845 + }else{
  846 + ps.setNull(30, Types.DOUBLE);
  847 + }
  848 + ps.setNull(31, Types.INTEGER);
  849 + ps.setNull(32, Types.INTEGER);
  850 + ps.setString(33, null);
  851 + ps.setString(34, null);
  852 + ps.setString(35, antExChuModel.getLungs());
  853 + ps.setString(36, null);
  854 + ps.setString(37, antExChuModel.getHeart());
  855 + if (!"2".equals(antExChuModel.getVulvaSele())) {
  856 + ps.setString(38, "1");
  857 + ps.setString(39, antExChuModel.getVulva());
  858 + } else {
  859 + ps.setString(38, "0");
  860 + ps.setString(39, "未见异常");
  861 + }
  862 + if (!"2".equals(antExChuModel.getVaginaSele())) {
  863 + ps.setString(40, "1");
  864 + ps.setString(41, antExChuModel.getVagina());
  865 + } else {
  866 + ps.setString(40, "0");
  867 + ps.setString(41, "未见异常");
  868 + }
  869 + if (!"2".equals(antExChuModel.getCervicalSele())) {
  870 + ps.setString(42, "1");
  871 + ps.setString(43, antExChuModel.getCervical());
  872 + } else {
  873 + ps.setString(42, "0");
  874 + ps.setString(43, "未见异常");
  875 + }
  876 + ps.setString(44, "0");
  877 + ps.setString(45, "未见异常");
  878 + if (!"2".equals(antExChuModel.getFujianSele())) {
  879 + ps.setString(46, "1");
  880 + ps.setString(47, antExChuModel.getFujian());
  881 + } else {
  882 + ps.setString(46, "0");
  883 + ps.setString(47, "未见异常");
  884 + }
  885 + if(antExChuModel.getXhdb() != null){
  886 + int xh = 0;
  887 + try {
  888 + String xhdb = antExChuModel.getXhdb();
  889 + double v = Double.parseDouble(xhdb);
  890 + xh = (int) v;
  891 + } catch (Exception e) {
  892 + e.printStackTrace();
  893 + }
  894 + ps.setInt(48, xh);
  895 + }else{
  896 + ps.setNull(48,Types.INTEGER);
  897 + }
  898 + if(antExChuModel.getBxbjs() != null){
  899 + ps.setDouble(49, Double.parseDouble(antExChuModel.getBxbjs()));
  900 + }else{
  901 + ps.setNull(49,Types.DOUBLE);
  902 + }
  903 + if(antExChuModel.getPlatelet() != null){
  904 + if (StringUtils.isNumeric(antExChuModel.getPlatelet()))
  905 + {
  906 + ps.setDouble(50, Double.parseDouble(antExChuModel.getPlatelet()));
  907 + }
1163 908  
  909 + }else{
  910 + ps.setNull(50,Types.INTEGER);
  911 + }
  912 + if(antExChuModel.getNdb() != null){
  913 + boolean b = false;
  914 + b = isDouble(antExChuModel.getNdb());
  915 + if(b){
  916 + ps.setDouble(51, Double.parseDouble(antExChuModel.getNdb()));
  917 + }else{
  918 + ps.setNull(51, Types.DOUBLE);
  919 + }
  920 + }else{
  921 + ps.setNull(51,Types.DOUBLE);
  922 + }
  923 + ps.setString(52, null);
  924 + ps.setString(53, null);
  925 + if(antExChuModel.getNt() != null){
  926 + boolean bo =false;
  927 + bo = isDouble(antExChuModel.getNt());
  928 + if(bo){
  929 + ps.setDouble(54, Double.parseDouble(antExChuModel.getNt()));
  930 + }else{
  931 + ps.setNull(54,Types.DOUBLE);
  932 + }
  933 + }else{
  934 + ps.setNull(54,Types.DOUBLE);
  935 + }
  936 + ps.setString(55, null);
  937 + ps.setString(56, null);
  938 + if(antExChuModel.getAbo() != null){
  939 + String xx = FunvCommonUtil.getBaseicConfigByid(antExChuModel.getAbo(), basicConfigService);
  940 + if(xx.equals("A")){
  941 + ps.setString(57,"1");
  942 + }else if(xx.equals("B")){
  943 + ps.setString(57,"2");
  944 + }else if(xx.equals("O")){
  945 + ps.setString(57,"3");
  946 + }else if(xx.equals("AB")){
  947 + ps.setString(57,"4");
  948 + }else{
  949 + ps.setString(57,"5");
  950 + }
  951 + }else{
  952 + ps.setString(57, null);
  953 + }
  954 + if(antExChuModel.getRh() != null){
  955 + if(antExChuModel.getRh().equals("yang")){
  956 + ps.setString(58, "2");
  957 + }else if(antExChuModel.getRh().equals("yin")){
  958 + ps.setString(58, "1");
  959 + }else{
  960 + ps.setString(58, "3");
  961 + }
  962 + }else{
  963 + ps.setString(58, null);
  964 + }
  965 + if(antExChuModel.getBloodSugar() != null){
  966 + ps.setDouble(59, Double.parseDouble(antExChuModel.getBloodSugar()));
  967 + }else{
  968 + ps.setNull(59,Types.DOUBLE);
  969 + }
  970 + if(antExChuModel.getXqgbzam() != null){
  971 + ps.setDouble(60, Double.parseDouble(antExChuModel.getXqgbzam()));
  972 + }else{
  973 + ps.setNull(60,Types.DOUBLE);
  974 + }
  975 + if(antExChuModel.getXqgczam() != null){
  976 + ps.setDouble(61, Double.parseDouble(antExChuModel.getXqgczam()));
  977 + }else{
  978 + ps.setNull(61,Types.DOUBLE);
  979 + }
  980 + if(antExChuModel.getAlbumin() != null){
  981 + ps.setDouble(62, Double.parseDouble(antExChuModel.getAlbumin()));
  982 + }else{
  983 + ps.setNull(62,Types.DOUBLE);
  984 + }
  985 + if(antExChuModel.getTotalBilirubin() != null){
  986 + ps.setDouble(63, Double.parseDouble(antExChuModel.getTotalBilirubin()));
  987 + }else{
  988 + ps.setNull(63,Types.DOUBLE);
  989 + }
  990 + if(antExChuModel.getJhBilirubin() != null){
  991 + ps.setDouble(64, Double.parseDouble(antExChuModel.getJhBilirubin()));
  992 + }else{
  993 + ps.setNull(64,Types.DOUBLE);
  994 + }
  995 + if(antExChuModel.getXnsd() != null){
  996 + ps.setDouble(65, Double.parseDouble(antExChuModel.getXnsd()));
  997 + }else{
  998 + ps.setNull(65,Types.DOUBLE);
  999 + }
  1000 + if(antExChuModel.getXqjq() != null){
  1001 + ps.setDouble(66, Double.parseDouble(antExChuModel.getXqjq()));
  1002 + }else{
  1003 + ps.setNull(66,Types.DOUBLE);
  1004 + }
  1005 + if (map.get("ydfmw") != null) {
  1006 + if("未见异常".equals(map.get("ydfmw").toString())){
  1007 + ps.setString(67, "1");
  1008 + }else if("滴虫".equals(map.get("ydfmw").toString())){
  1009 + ps.setString(67, "2");
  1010 + }else if("假丝酵母菌".equals(map.get("ydfmw").toString())){
  1011 + ps.setString(67,"3");
  1012 + }else{
  1013 + ps.setString(67,"9");
  1014 + }
  1015 + } else {
  1016 + ps.setString(67, null);
  1017 + }
1164 1018  
  1019 + if (map.get("ydqjd") != null) {
  1020 + if("Ⅰ度".equals(map.get("ydqjd").toString())){
  1021 + ps.setString(68, "1");
  1022 + }else if("Ⅱ度".equals(map.get("ydqjd").toString())){
  1023 + ps.setString(68, "2");
  1024 + }else if("Ⅲ度".equals(map.get("ydqjd").toString())){
  1025 + ps.setString(68,"3");
  1026 + }else if("Ⅳ度".equals(map.get("ydqjd").toString())){
  1027 + ps.setString(68,"4");
  1028 + }else{
  1029 + ps.setString(68, null);
  1030 + }
  1031 + } else {
  1032 + ps.setString(68, null);
  1033 + }
  1034 + if (map.get("ygekt") != null) {
  1035 + if("+".equals(map.get("ygekt").toString())){
  1036 + ps.setString(69,"2");
  1037 + }else if("-".equals(map.get("ygekt").toString())){
  1038 + ps.setString(69,"1");
  1039 + }else{
  1040 + ps.setString(69, null);
  1041 + }
  1042 + } else {
  1043 + ps.setString(69, null);
  1044 + }
  1045 +
  1046 + if (map.get("ygeky") != null) {
  1047 + if("+".equals(map.get("ygeky").toString())){
  1048 + ps.setString(70, "2");
  1049 + }else if("-".equals(map.get("ygeky").toString())){
  1050 + ps.setString(70,"1");
  1051 + }else{
  1052 + ps.setString(70, null);
  1053 + }
  1054 +
  1055 + } else {
  1056 + ps.setString(70, null);
  1057 + }
  1058 + if (map.get("ygbmkt") != null) {
  1059 + if("+".equals(map.get("ygbmkt").toString())){
  1060 + ps.setString(71, "2");
  1061 + }else if("-".equals(map.get("ygbmkt").toString())){
  1062 + ps.setString(71,"1");
  1063 + }else{
  1064 + ps.setString(71, null);
  1065 + }
  1066 + } else {
  1067 + ps.setString(71, null);
  1068 + }
  1069 + if (map.get("ygbmky") != null) {
  1070 + if("+".equals(map.get("ygbmky").toString())){
  1071 + ps.setString(72, "2");
  1072 + }else if("-".equals(map.get("ygbmky").toString())){
  1073 + ps.setString(72, "1");
  1074 + }else{
  1075 + ps.setString(72, null);
  1076 + }
  1077 + } else {
  1078 + ps.setString(72, "3");
  1079 + }
  1080 + if (map.get("yghxkt") != null) {
  1081 + if("+".equals(map.get("yghxkt").toString())){
  1082 + ps.setString(73, "2");
  1083 + }else if("-".equals(map.get("yghxkt").toString())){
  1084 + ps.setString(73, "1");
  1085 + }else{
  1086 + ps.setString(73, null);
  1087 + }
  1088 + } else {
  1089 + ps.setString(73, null);
  1090 + }
  1091 + if (map.get("syjg") != null) {
  1092 + if("+".equals(map.get("syjg").toString())){
  1093 + ps.setString(74, "2");
  1094 + }else if("-".equals(map.get("syjg").toString())){
  1095 + ps.setString(74, "1");
  1096 + }else{
  1097 + ps.setString(74,null);
  1098 + }
  1099 + } else {
  1100 + ps.setString(74, null);
  1101 + }
  1102 + if (map.get("hivkt") != null) {
  1103 + if("+".equals(map.get("hivkt").toString())){
  1104 + ps.setString(75, "2");
  1105 + }else if("-".equals(map.get("hivkt").toString())){
  1106 + ps.setString(75, "1");
  1107 + }else{
  1108 + ps.setString(75, null);
  1109 + }
  1110 + } else {
  1111 + ps.setString(75, null);
  1112 + }
  1113 + ps.setString(76, antExChuModel.getbChao());
  1114 + ps.setString(77, null);
  1115 + if (map.get("diagnosis") != null) {
  1116 + ps.setString(78, map.get("diagnosis").toString());
  1117 + } else {
  1118 + ps.setString(78, null);
  1119 + }
  1120 + ps.setString(79, null);
  1121 + ps.setString(80, null);
  1122 + ps.setString(81, null);
  1123 + ps.setString(82, null);
  1124 + if (map.get("checkDoctor") != null) {
  1125 + ps.setString(83, map.get("checkDoctor").toString());
  1126 + } else {
  1127 + ps.setString(83, null);
  1128 + }
  1129 + if(antExChuModel.getCheckTime() != null){
  1130 + ps.setDate(84, new Date(antExChuModel.getCheckTime().getTime()));
  1131 + }else{
  1132 + ps.setNull(84, Types.DATE);
  1133 + }
  1134 + if(antExChuModel.getNextCheckTime() != null){
  1135 + ps.setDate(85, new Date(antExChuModel.getNextCheckTime().getTime()));
  1136 + }else{
  1137 + ps.setNull(85, Types.DATE);
  1138 + }
  1139 + ps.setString(86, null);
  1140 + ps.setString(87,createOrgId);
  1141 + ps.setString(88,orgName);
  1142 + ps.setString(89,creator);
  1143 + ps.setString(90,creatorId);
  1144 + }
  1145 +
  1146 + private void psInSqlDiag(AntExChuModel antExChuModel, PreparedStatement ps, String createOrgId, String orgName, String creator, String creatorId, Patients patients, String liveAddress, String code, String id) throws SQLException {
  1147 + ps.setDate(1, new Date(antExChuModel.getModified().getTime()));
  1148 + ps.setString(2, code);
  1149 + ps.setString(3, id);
  1150 + ps.setString(4, antExChuModel.getId());
  1151 + ps.setString(5, patients.getUsername());
  1152 + ps.setString(6, liveAddress);
  1153 + ps.setString(7, patients.getPhone());
  1154 + ps.setString(8, patients.getPworkUnit());
  1155 + if(antExChuModel.getWeight() != null){
  1156 + ps.setDouble(9, Double.parseDouble(antExChuModel.getWeight()));
  1157 + }else{
  1158 + ps.setNull(9, Types.DOUBLE);
  1159 + }
  1160 + ps.setDate(10,new Date(antExChuModel.getLastMenses().getTime()));
  1161 + ps.setDate(11, new Date(patients.getDueDate().getTime()));
  1162 + if(antExChuModel.getPregnancyTimes() != null){
  1163 + ps.setInt(12, antExChuModel.getPregnancyTimes());
  1164 + }else{
  1165 + ps.setNull(12,Types.INTEGER);
  1166 + }
  1167 + if(antExChuModel.getProdTime() != null){
  1168 + ps.setInt(13, antExChuModel.getProdTime());
  1169 + }else{
  1170 + ps.setNull(13,Types.INTEGER);
  1171 + }
  1172 + if(antExChuModel.getAbortionZR() != null){
  1173 + ps.setInt(14, antExChuModel.getAbortionZR());
  1174 + }else{
  1175 + ps.setNull(14,Types.INTEGER);
  1176 + }
  1177 + if(antExChuModel.getAbortionRG() != null){
  1178 + ps.setInt(15, antExChuModel.getAbortionRG());
  1179 + }else{
  1180 + ps.setNull(15,Types.INTEGER);
  1181 + }
  1182 + ps.setString(16, patients.getHusbandName());
  1183 + if(antExChuModel.getCheckTime() != null){
  1184 + ps.setDate(17, new Date(antExChuModel.getCheckTime().getTime()));
  1185 + }else{
  1186 + ps.setNull(17,Types.DATE);
  1187 + }
  1188 + if(patients.getBookbuildingDate() != null){
  1189 + ps.setDate(18,new Date(patients.getBookbuildingDate().getTime()));
  1190 + }else{
  1191 + ps.setNull(18,Types.DATE);
  1192 + }
  1193 + ps.setString(19,createOrgId);
  1194 + ps.setString(20,orgName);
  1195 + ps.setString(21,creator);
  1196 + ps.setString(22,creatorId);
  1197 + }
  1198 +
  1199 +
1165 1200 /**
1166 1201 * 非第一次产检随访服务(复诊)
1167 1202 * @param antenatalExaminationModel
... ... @@ -1296,7 +1331,7 @@
1296 1331 }catch (Exception e){
1297 1332 e.printStackTrace();
1298 1333 }
1299   - ps.setDouble(15, parseDouble);
  1334 + ps.setDouble(15, parseDouble==null ? Types.DOUBLE : parseDouble);
1300 1335 }else{
1301 1336 ps.setNull(15,Types.DOUBLE);
1302 1337 }
1303 1338  
1304 1339  
1305 1340  
1306 1341  
... ... @@ -3792,13 +3827,19 @@
3792 3827 PatientsQuery patientsQuery = new PatientsQuery();
3793 3828 patientsQuery.setId(id);
3794 3829 patientsQuery.setCardNo(cardNo);
  3830 + System.out.println("saveYfController ___ 1 参数,孕妇id:"+id+" , 孕妇身份证号:"+cardNo);
3795 3831 List<Patients> list = patientsService.queryPatient(patientsQuery);
  3832 + System.out.println("saveYfController ___ 2 参数,获取孕妇档案,条数:"+list.size());
  3833 +
3796 3834 System.out.println(DateUtil.getyyyy_MM_dd_hms(new java.util.Date())+" pateient size = "+ list.size());
3797 3835 if(list != null && list.size()>0){
3798 3836 for(Patients patients : list){
3799 3837 try{
  3838 + System.out.println("saveYfController ___ satrt__ 3 单个孕妇信息保存公卫,孕妇id:" + patients.getId() + " , 孕妇身份证号:" + patients.getCardNo());
3800 3839 br = saveBaseInfo(patients);
  3840 + System.out.println("saveYfController ___ end ____ 3 ");
3801 3841 }catch (Exception e){
  3842 + System.out.println("saveYfController ___ 4 孕妇信息保存公卫异常");
3802 3843 ExceptionUtils.catchException(e, "saveYf error.");
3803 3844 continue;
3804 3845 }
3805 3846  
3806 3847  
3807 3848  
3808 3849  
... ... @@ -3843,12 +3884,19 @@
3843 3884 BaseObjectResponse br = null;
3844 3885 AntExChuQuery antExChuQuery = new AntExChuQuery();
3845 3886 antExChuQuery.setParentId(parentId);
  3887 + System.out.println("saveChuZhenController ——— 1 参数,建档parentId:"+parentId);
3846 3888 List<AntExChuModel> list = antExService.queryAntExChu(antExChuQuery);
  3889 + System.out.println("saveChuZhenController ——— 2 参数,建档parentId,获取初证条数:"+list.size());
  3890 +
3847 3891 if(list != null && list.size()>0){
3848 3892 for(AntExChuModel antExChuModel : list){
3849 3893 try{
  3894 + System.out.println("saveChuZhenController ——— 3 获取初诊数据保存,公卫数据库操作开始,操作建档id打印:"+antExChuModel.getParentId()+" , 初证id打印:"+antExChuModel.getId());
3850 3895 br = saveWoman_Prefirstvisit(antExChuModel);
  3896 + System.out.println("saveChuZhenController ——— 4 获取初诊数据保存,公卫数据库操作完成,操作建档id打印:"+antExChuModel.getParentId()+" , 初证id打印:"+antExChuModel.getId());
  3897 +
3851 3898 }catch (Exception e){
  3899 + System.out.println("saveChuZhenController ——— 5 初诊异常打印。。。。。。");
3852 3900 ExceptionUtils.catchException(e, "saveChuZhen error.");
3853 3901 continue;
3854 3902 }
platform-operate-api/src/main/resources/config.properties View file @ 53f75f5
... ... @@ -35,8 +35,12 @@
35 35 #同步数据到v2.0
36 36 sync_to_v2_url=http://hengshui.mamibeibi.com:8091
37 37  
38   -#华大基因url 测试 2019年11月8号)将不支持http 正式bisp-tssfy tssfy123456 正式:https://applet.bgi.com/bisp-all/ 测试:https://hbms.bgi.com/bisp-all/
39   -huada_url=http://119.23.237.220/bisp-all
  38 +#华大基因url 测试 正式bisp-tssfy tssfy123456
  39 +#huada_url=http://119.23.237.220/bisp-all
  40 +#huada_syscode=bisp-czsfy
  41 +#huada_secret=czsfy123$
  42 +
  43 +huada_url=https://hbms.bgi.com/bisp-all
40 44 huada_syscode=bisp-czsfy
41 45 huada_secret=czsfy123$
platform-reportData/pom.xml View file @ 53f75f5
... ... @@ -17,11 +17,11 @@
17 17 <artifactId>platform-common</artifactId>
18 18 <version>1.0.1</version>
19 19 </dependency>
20   - <dependency>
  20 + <!--<dependency>
21 21 <groupId>com.oracle</groupId>
22 22 <artifactId>ojdbc14</artifactId>
23 23 <version>11.2.0.1.0</version>
24   - </dependency>
  24 + </dependency>-->
25 25 </dependencies>
26 26 <build>
27 27 <plugins>
... ... @@ -561,11 +561,11 @@
561 561 <artifactId>velocity-tools</artifactId>
562 562 <version>2.0</version>
563 563 </dependency>
564   - <dependency>
  564 + <!--<dependency>
565 565 <groupId>com.oracle</groupId>
566 566 <artifactId>ojdbc14</artifactId>
567 567 <version>11.2.0.1.0</version>
568   - </dependency>
  568 + </dependency>-->
569 569 <dependency>
570 570 <groupId>commons-dbutils</groupId>
571 571 <artifactId>commons-dbutils</artifactId>
572 572  
... ... @@ -582,11 +582,11 @@
582 582 <version>1.2.8</version>
583 583 </dependency>
584 584  
585   - <dependency>
  585 + <!--<dependency>
586 586 <groupId>com.aspose</groupId>
587 587 <artifactId>aspose-words</artifactId>
588 588 <version>15.8.0</version>
589   - </dependency>
  589 + </dependency>-->
590 590  
591 591 </dependencies>
592 592 </project>