|
|
@@ -49,150 +49,151 @@ public class ConsentCreateParam {
|
|
|
|
|
|
int rid = Integer.parseInt(consentMstRid);
|
|
|
|
|
|
- // 새 서식을 작성할 경우
|
|
|
- if (rid == 0 || consentStateEng.equals(ConsentConfig.UNFINISHED)) {
|
|
|
- String ordDeptCd = patientInfoVO.getOrdDeptCd();
|
|
|
- String deptEngAbbr = patientInfoVO.getDeptEngAbbr();
|
|
|
- String ordDeptNm = patientInfoVO.getOrdDeptNm();
|
|
|
- String pid = patientInfoVO.getPid();
|
|
|
- String cretNo = patientInfoVO.getCretNo();
|
|
|
- String roomCd = patientInfoVO.getRoomCd();
|
|
|
- String inDd = patientInfoVO.getInDd();
|
|
|
- String dschDd = patientInfoVO.getDschDd();
|
|
|
- String ordType = patientInfoVO.getOrdType();
|
|
|
- String instCd = patientInfoVO.getInstCd();
|
|
|
- String mainDrId = patientInfoVO.getMainDrId();
|
|
|
- String mainDrName = patientInfoVO.getMainDrName();
|
|
|
- String erDrNm = patientInfoVO.getErDrNm();
|
|
|
- String firstRgstDt = patientInfoVO.getFirstRgstDt();
|
|
|
- String sa = patientInfoVO.getSa();
|
|
|
- String patientName = patientInfoVO.getPatientName();
|
|
|
- String juminNo = patientInfoVO.getJuminNo();
|
|
|
- String zipCdAddr = patientInfoVO.getZipCdAddr();
|
|
|
- String telNum = patientInfoVO.getTelNum();
|
|
|
- String insuKind = patientInfoVO.getInsuKind();
|
|
|
- String ward = patientInfoVO.getWard();
|
|
|
- String dxCd = patientInfoVO.getDxCd();
|
|
|
- String dxNm = patientInfoVO.getDxNm();
|
|
|
- String gbn = patientInfoVO.getGbn();
|
|
|
- String opDeptCd = patientInfoVO.getOpDeptCd();
|
|
|
- String opDeptNm = patientInfoVO.getOpDeptNm();
|
|
|
- String opDrNm = patientInfoVO.getOpDrNm();
|
|
|
- String opDrId = patientInfoVO.getOpDrId();
|
|
|
- String opCnfmDd = patientInfoVO.getOpCnfmDd();
|
|
|
- String perfDrNm = patientInfoVO.getPerfDrNm();
|
|
|
- String perfDrFlag = patientInfoVO.getPerfDrFlag();
|
|
|
- String perfDrDept = patientInfoVO.getPerfDrDept();
|
|
|
- String opDiagNm = patientInfoVO.getOpDiagNm();
|
|
|
- String opNm = patientInfoVO.getOpNm();
|
|
|
- String anstDrNm1 = patientInfoVO.getAnstDrNm1();
|
|
|
- String anstDrFlag1 = patientInfoVO.getAnstDrFlag1();
|
|
|
- String anstDeptNm1 = patientInfoVO.getAnstDeptNm1();
|
|
|
- String anstDrNm2 = patientInfoVO.getAnstDrNm2();
|
|
|
- String anstDrFlag2 = patientInfoVO.getAnstDrFlag2();
|
|
|
- String anstDeptNm2 = patientInfoVO.getAnstDeptNm2();
|
|
|
- String anstDrNm3 = patientInfoVO.getAnstDrNm3();
|
|
|
- String anstDrFlag3 = patientInfoVO.getAnstDrFlag3();
|
|
|
- String anstDeptNm3 = patientInfoVO.getAnstDeptNm3();
|
|
|
- String opRsrvNo = patientInfoVO.getOpRsrvNo();
|
|
|
- String orderNo = patientInfoVO.getOrderNo();
|
|
|
- String printTime = patientInfoVO.getPrintTime();
|
|
|
- String ocrCd = patientInfoVO.getOcrCd();
|
|
|
- String inputId = patientInfoVO.getInputId();
|
|
|
- String inputNm = patientInfoVO.getInputNm();
|
|
|
- String signImg = patientInfoVO.getSignImg();
|
|
|
- String bp = patientInfoVO.getBp();
|
|
|
- String dm = patientInfoVO.getDm();
|
|
|
- String heart = patientInfoVO.getHeart();
|
|
|
- String kidney = patientInfoVO.getKidney();
|
|
|
- String respiration = patientInfoVO.getRespiration();
|
|
|
- String hx = patientInfoVO.getHx();
|
|
|
- String allergy = patientInfoVO.getAllergy();
|
|
|
- String drug = patientInfoVO.getDrug();
|
|
|
- String smoking = patientInfoVO.getSmoking();
|
|
|
- String idio = patientInfoVO.getIdio();
|
|
|
- String nacrotics = patientInfoVO.getNacrotics();
|
|
|
- String airway = patientInfoVO.getAirway();
|
|
|
- String hemorrhage = patientInfoVO.getHemorrhage();
|
|
|
- String statusEtc = patientInfoVO.getStatusEtc();
|
|
|
- String signImage = "";
|
|
|
-
|
|
|
- HashMap<String, String> mData = new HashMap<String, String>();
|
|
|
-
|
|
|
- if (!userDrFlag.equals("Y")) {
|
|
|
- mData.put("userId", loginUserId);
|
|
|
- mData.put("deptCd", logionUserDeptCd);
|
|
|
- map.put("mainDrId", loginUserId);
|
|
|
- } else {
|
|
|
- mData.put("userId", loginUserId);
|
|
|
- mData.put("deptCd", logionUserDeptCd);
|
|
|
- map.put("mainDrId", mainDrId);
|
|
|
- }
|
|
|
+ String ordDeptCd = patientInfoVO.getOrdDeptCd();
|
|
|
+ String deptEngAbbr = patientInfoVO.getDeptEngAbbr();
|
|
|
+ String ordDeptNm = patientInfoVO.getOrdDeptNm();
|
|
|
+ String pid = patientInfoVO.getPid();
|
|
|
+ String cretNo = patientInfoVO.getCretNo();
|
|
|
+ String roomCd = patientInfoVO.getRoomCd();
|
|
|
+ String inDd = patientInfoVO.getInDd();
|
|
|
+ String dschDd = patientInfoVO.getDschDd();
|
|
|
+ String ordType = patientInfoVO.getOrdType();
|
|
|
+ String instCd = patientInfoVO.getInstCd();
|
|
|
+ String mainDrId = patientInfoVO.getMainDrId();
|
|
|
+ String mainDrName = patientInfoVO.getMainDrName();
|
|
|
+ String erDrNm = patientInfoVO.getErDrNm();
|
|
|
+ String firstRgstDt = patientInfoVO.getFirstRgstDt();
|
|
|
+ String sa = patientInfoVO.getSa();
|
|
|
+ String patientName = patientInfoVO.getPatientName();
|
|
|
+ String juminNo = patientInfoVO.getJuminNo();
|
|
|
+ String zipCdAddr = patientInfoVO.getZipCdAddr();
|
|
|
+ String telNum = patientInfoVO.getTelNum();
|
|
|
+ String insuKind = patientInfoVO.getInsuKind();
|
|
|
+ String ward = patientInfoVO.getWard();
|
|
|
+ String dxCd = patientInfoVO.getDxCd();
|
|
|
+ String dxNm = patientInfoVO.getDxNm();
|
|
|
+ String gbn = patientInfoVO.getGbn();
|
|
|
+ String opDeptCd = patientInfoVO.getOpDeptCd();
|
|
|
+ String opDeptNm = patientInfoVO.getOpDeptNm();
|
|
|
+ String opDrNm = patientInfoVO.getOpDrNm();
|
|
|
+ String opDrId = patientInfoVO.getOpDrId();
|
|
|
+ String opCnfmDd = patientInfoVO.getOpCnfmDd();
|
|
|
+ String perfDrNm = patientInfoVO.getPerfDrNm();
|
|
|
+ String perfDrFlag = patientInfoVO.getPerfDrFlag();
|
|
|
+ String perfDrDept = patientInfoVO.getPerfDrDept();
|
|
|
+ String opDiagNm = patientInfoVO.getOpDiagNm();
|
|
|
+ String opNm = patientInfoVO.getOpNm();
|
|
|
+ String anstDrNm1 = patientInfoVO.getAnstDrNm1();
|
|
|
+ String anstDrFlag1 = patientInfoVO.getAnstDrFlag1();
|
|
|
+ String anstDeptNm1 = patientInfoVO.getAnstDeptNm1();
|
|
|
+ String anstDrNm2 = patientInfoVO.getAnstDrNm2();
|
|
|
+ String anstDrFlag2 = patientInfoVO.getAnstDrFlag2();
|
|
|
+ String anstDeptNm2 = patientInfoVO.getAnstDeptNm2();
|
|
|
+ String anstDrNm3 = patientInfoVO.getAnstDrNm3();
|
|
|
+ String anstDrFlag3 = patientInfoVO.getAnstDrFlag3();
|
|
|
+ String anstDeptNm3 = patientInfoVO.getAnstDeptNm3();
|
|
|
+ String opRsrvNo = patientInfoVO.getOpRsrvNo();
|
|
|
+ String orderNo = patientInfoVO.getOrderNo();
|
|
|
+ String printTime = patientInfoVO.getPrintTime();
|
|
|
+ String ocrCd = patientInfoVO.getOcrCd();
|
|
|
+ String inputId = patientInfoVO.getInputId();
|
|
|
+ String inputNm = patientInfoVO.getInputNm();
|
|
|
+ String signImg = patientInfoVO.getSignImg();
|
|
|
+ String bp = patientInfoVO.getBp();
|
|
|
+ String dm = patientInfoVO.getDm();
|
|
|
+ String heart = patientInfoVO.getHeart();
|
|
|
+ String kidney = patientInfoVO.getKidney();
|
|
|
+ String respiration = patientInfoVO.getRespiration();
|
|
|
+ String hx = patientInfoVO.getHx();
|
|
|
+ String allergy = patientInfoVO.getAllergy();
|
|
|
+ String drug = patientInfoVO.getDrug();
|
|
|
+ String smoking = patientInfoVO.getSmoking();
|
|
|
+ String idio = patientInfoVO.getIdio();
|
|
|
+ String nacrotics = patientInfoVO.getNacrotics();
|
|
|
+ String airway = patientInfoVO.getAirway();
|
|
|
+ String hemorrhage = patientInfoVO.getHemorrhage();
|
|
|
+ String statusEtc = patientInfoVO.getStatusEtc();
|
|
|
+ String signImage = "";
|
|
|
|
|
|
- if (userDrFlag.equals("Y") && ordType.equals("O")) {
|
|
|
- mData.put("userId", mainDrId);
|
|
|
- mData.put("deptCd", ordDeptCd);
|
|
|
- map.put("mainDrId", mainDrId);
|
|
|
- }
|
|
|
+ HashMap<String, String> mData = new HashMap<String, String>();
|
|
|
|
|
|
- mData.put("instCd", BuildConfig.INST_CD);
|
|
|
+ if (!userDrFlag.equals("Y")) {
|
|
|
+ mData.put("userId", loginUserId);
|
|
|
+ mData.put("deptCd", logionUserDeptCd);
|
|
|
+ map.put("mainDrId", loginUserId);
|
|
|
+ } else {
|
|
|
+ mData.put("userId", loginUserId);
|
|
|
+ mData.put("deptCd", logionUserDeptCd);
|
|
|
+ map.put("mainDrId", mainDrId);
|
|
|
+ }
|
|
|
|
|
|
- HttpSoapConnection connection = new HttpSoapConnection(ConsentConfig.HOST_HOSPITAL, ConsentConfig.GET_SIGN_DATA, mData);
|
|
|
- try {
|
|
|
- SoapObject object = connection.execute().get();
|
|
|
- if (object != null) {
|
|
|
- signImage = object.getProperty("SignImage").toString().trim();
|
|
|
- signImage = signImage.equals(ConsentConfig.RETURN_NULL) ? "" : signImage;
|
|
|
- }
|
|
|
+ if (userDrFlag.equals("Y") && ordType.equals("O")) {
|
|
|
+ mData.put("userId", mainDrId);
|
|
|
+ mData.put("deptCd", ordDeptCd);
|
|
|
+ map.put("mainDrId", mainDrId);
|
|
|
+ }
|
|
|
|
|
|
- } catch (ExecutionException e) {
|
|
|
- e.printStackTrace();
|
|
|
- } catch (InterruptedException e) {
|
|
|
- e.printStackTrace();
|
|
|
+ mData.put("instCd", BuildConfig.INST_CD);
|
|
|
+
|
|
|
+ HttpSoapConnection connection = new HttpSoapConnection(ConsentConfig.HOST_HOSPITAL, ConsentConfig.GET_SIGN_DATA, mData);
|
|
|
+ try {
|
|
|
+ SoapObject object = connection.execute().get();
|
|
|
+ if (object != null) {
|
|
|
+ signImage = object.getProperty("SignImage").toString().trim();
|
|
|
+ signImage = signImage.equals(ConsentConfig.RETURN_NULL) ? "" : signImage;
|
|
|
}
|
|
|
|
|
|
- UserVO userVO = new UserVO();
|
|
|
- connection = new HttpSoapConnection(ConsentConfig.HOST_HOSPITAL, ConsentConfig.GET_USER_INFO, mData);
|
|
|
- try {
|
|
|
- SoapObject object = connection.execute().get();
|
|
|
- String userId = object.getProperty("userId").toString().trim();
|
|
|
- String userName = object.getProperty("userName").toString().trim();
|
|
|
- String userDeptCode = object.getProperty("userDeptCode").toString().trim();
|
|
|
- String userDeptName = object.getProperty("userDeptName").toString().trim();
|
|
|
- String userDeptEngAbbr = object.getProperty("deptEngAbbr").toString().trim();
|
|
|
- String jobKindCd = object.getProperty("jobKindCd").toString().trim();
|
|
|
- String jobKindNm = object.getProperty("jobKindNm").toString().trim();
|
|
|
- String userInstCd = object.getProperty("instCd").toString().trim();
|
|
|
- String userTelNo = object.getProperty("userTelNo").toString().trim();
|
|
|
- String ioFlag = object.getProperty("ioFlag").toString().trim();
|
|
|
-
|
|
|
- userId = userId.equals(ConsentConfig.RETURN_NULL) ? "" : userId;
|
|
|
- userName = userName.equals(ConsentConfig.RETURN_NULL) ? "" : userName;
|
|
|
- userDeptCode = userDeptCode.equals(ConsentConfig.RETURN_NULL) ? "" : userDeptCode;
|
|
|
- userDeptName = userDeptName.equals(ConsentConfig.RETURN_NULL) ? "" : userDeptName;
|
|
|
- userDeptEngAbbr = deptEngAbbr.equals(ConsentConfig.RETURN_NULL) ? "" : deptEngAbbr;
|
|
|
- jobKindCd = jobKindCd.equals(ConsentConfig.RETURN_NULL) ? "" : jobKindCd;
|
|
|
- jobKindNm = jobKindNm.equals(ConsentConfig.RETURN_NULL) ? "" : jobKindNm;
|
|
|
- userInstCd = userInstCd.equals(ConsentConfig.RETURN_NULL) ? "" : userInstCd;
|
|
|
- userTelNo = userTelNo.equals(ConsentConfig.RETURN_NULL) ? "" : userTelNo;
|
|
|
- ioFlag = ioFlag.equals(ConsentConfig.RETURN_NULL) ? "" : ioFlag;
|
|
|
-
|
|
|
- userVO.setUserId(userId);
|
|
|
- userVO.setUserName(userName);
|
|
|
- userVO.setUserDeptCode(userDeptCode);
|
|
|
- userVO.setUserDeptName(userDeptName);
|
|
|
- userVO.setDeptEngAbbr(userDeptEngAbbr);
|
|
|
- userVO.setJobKindCd(jobKindCd);
|
|
|
- userVO.setJobKindNm(jobKindNm);
|
|
|
- userVO.setUserInstCd(userInstCd);
|
|
|
- userVO.setUserTelNo(userTelNo);
|
|
|
- userVO.setIoFlag(ioFlag);
|
|
|
+ } catch (ExecutionException e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ } catch (InterruptedException e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
|
|
|
- } catch (ExecutionException e) {
|
|
|
- e.printStackTrace();
|
|
|
- } catch (InterruptedException e) {
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
+ UserVO userVO = new UserVO();
|
|
|
+ connection = new HttpSoapConnection(ConsentConfig.HOST_HOSPITAL, ConsentConfig.GET_USER_INFO, mData);
|
|
|
+ try {
|
|
|
+ SoapObject object = connection.execute().get();
|
|
|
+ String userId = object.getProperty("userId").toString().trim();
|
|
|
+ String userName = object.getProperty("userName").toString().trim();
|
|
|
+ String userDeptCode = object.getProperty("userDeptCode").toString().trim();
|
|
|
+ String userDeptName = object.getProperty("userDeptName").toString().trim();
|
|
|
+ String userDeptEngAbbr = object.getProperty("deptEngAbbr").toString().trim();
|
|
|
+ String jobKindCd = object.getProperty("jobKindCd").toString().trim();
|
|
|
+ String jobKindNm = object.getProperty("jobKindNm").toString().trim();
|
|
|
+ String userInstCd = object.getProperty("instCd").toString().trim();
|
|
|
+ String userTelNo = object.getProperty("userTelNo").toString().trim();
|
|
|
+ String ioFlag = object.getProperty("ioFlag").toString().trim();
|
|
|
+
|
|
|
+ userId = userId.equals(ConsentConfig.RETURN_NULL) ? "" : userId;
|
|
|
+ userName = userName.equals(ConsentConfig.RETURN_NULL) ? "" : userName;
|
|
|
+ userDeptCode = userDeptCode.equals(ConsentConfig.RETURN_NULL) ? "" : userDeptCode;
|
|
|
+ userDeptName = userDeptName.equals(ConsentConfig.RETURN_NULL) ? "" : userDeptName;
|
|
|
+ userDeptEngAbbr = deptEngAbbr.equals(ConsentConfig.RETURN_NULL) ? "" : deptEngAbbr;
|
|
|
+ jobKindCd = jobKindCd.equals(ConsentConfig.RETURN_NULL) ? "" : jobKindCd;
|
|
|
+ jobKindNm = jobKindNm.equals(ConsentConfig.RETURN_NULL) ? "" : jobKindNm;
|
|
|
+ userInstCd = userInstCd.equals(ConsentConfig.RETURN_NULL) ? "" : userInstCd;
|
|
|
+ userTelNo = userTelNo.equals(ConsentConfig.RETURN_NULL) ? "" : userTelNo;
|
|
|
+ ioFlag = ioFlag.equals(ConsentConfig.RETURN_NULL) ? "" : ioFlag;
|
|
|
+
|
|
|
+ userVO.setUserId(userId);
|
|
|
+ userVO.setUserName(userName);
|
|
|
+ userVO.setUserDeptCode(userDeptCode);
|
|
|
+ userVO.setUserDeptName(userDeptName);
|
|
|
+ userVO.setDeptEngAbbr(userDeptEngAbbr);
|
|
|
+ userVO.setJobKindCd(jobKindCd);
|
|
|
+ userVO.setJobKindNm(jobKindNm);
|
|
|
+ userVO.setUserInstCd(userInstCd);
|
|
|
+ userVO.setUserTelNo(userTelNo);
|
|
|
+ userVO.setIoFlag(ioFlag);
|
|
|
+
|
|
|
+ } catch (ExecutionException e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ } catch (InterruptedException e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+
|
|
|
+ // 새 서식을 작성할 경우
|
|
|
+ if (rid == 0 || consentStateEng.equals(ConsentConfig.UNFINISHED)) {
|
|
|
|
|
|
map.put("parCMDCFT_device", "M");
|
|
|
map.put("parCMDCFT_1PrintIP", "");
|
|
|
@@ -285,37 +286,25 @@ public class ConsentCreateParam {
|
|
|
map.put("ward", ward);
|
|
|
map.put("dschDd", dschDd);
|
|
|
} else {
|
|
|
- String pid = patientInfoVO.getPid();
|
|
|
- String deptCd = patientInfoVO.getOpDeptCd();
|
|
|
- String ordType = patientInfoVO.getOrdType();
|
|
|
- String inDd = patientInfoVO.getInDd();
|
|
|
- String ward = patientInfoVO.getWard();
|
|
|
- String roomCd = patientInfoVO.getRoomCd();
|
|
|
- String cretNo = patientInfoVO.getCretNo();
|
|
|
- String mainDrId = patientInfoVO.getMainDrId();
|
|
|
- String opRsrvNo = patientInfoVO.getOpRsrvNo();
|
|
|
- String dschDd = patientInfoVO.getDschDd();
|
|
|
-
|
|
|
map.put("parCMDCHD_1PatientNo", pid);
|
|
|
- map.put("parCMDCHD_1DepartmentCd", deptCd);
|
|
|
+ map.put("parCMDCHD_1DepartmentCd", opDeptCd);
|
|
|
map.put("ordType", ordType);
|
|
|
map.put("parCMDCHD_1VisitDt", inDd);
|
|
|
map.put("ward", ward);
|
|
|
map.put("parNUR_Fast_HospitalroomNo", roomCd);
|
|
|
map.put("parCMSGBD_Cretno", cretNo);
|
|
|
-// map.put("mainDrId", mainDrId);
|
|
|
map.put("parCMDCBD_OpRsrvNo", opRsrvNo);
|
|
|
map.put("dschDd", dschDd);
|
|
|
|
|
|
- if (!userDrFlag.equals("Y")) {
|
|
|
- map.put("mainDrId", loginUserId);
|
|
|
- } else {
|
|
|
- map.put("mainDrId", mainDrId);
|
|
|
- }
|
|
|
-
|
|
|
- if (userDrFlag.equals("Y") && ordType.equals("O")) {
|
|
|
- map.put("mainDrId", mainDrId);
|
|
|
- }
|
|
|
+// if (!userDrFlag.equals("Y")) {
|
|
|
+// map.put("mainDrId", loginUserId);
|
|
|
+// } else {
|
|
|
+// map.put("mainDrId", mainDrId);
|
|
|
+// }
|
|
|
+//
|
|
|
+// if (userDrFlag.equals("Y") && ordType.equals("O")) {
|
|
|
+// map.put("mainDrId", mainDrId);
|
|
|
+// }
|
|
|
}
|
|
|
|
|
|
return map;
|
songjunekeun