|
@@ -507,7 +507,7 @@ public class MedicalViewApiController {
|
|
|
WhiteList whiteList=whiteListService.queryByIpAddress(ip);
|
|
|
if(whiteList==null){
|
|
|
results.put("resultCode", -1);
|
|
|
- results.put("message", "当前请求来源未在白名单中【"+ip+"】");
|
|
|
+ results.put("resultMessage", "当前请求来源未在白名单中【"+ip+"】");
|
|
|
return results;
|
|
|
}
|
|
|
if (haicipat == null) {
|
|
@@ -678,7 +678,7 @@ public class MedicalViewApiController {
|
|
|
WhiteList whiteList=whiteListService.queryByIpAddress(ip);
|
|
|
if(whiteList==null){
|
|
|
results.put("resultCode", -1);
|
|
|
- results.put("message", "当前请求来源未在白名单中【"+ip+"】");
|
|
|
+ results.put("resultMessage", "当前请求来源未在白名单中【"+ip+"】");
|
|
|
return results;
|
|
|
}
|
|
|
if (haiciCharge == null) {
|
|
@@ -924,7 +924,7 @@ public class MedicalViewApiController {
|
|
|
WhiteList whiteList=whiteListService.queryByIpAddress(ip);
|
|
|
if(whiteList==null){
|
|
|
results.put("resultCode", -1);
|
|
|
- results.put("message", "当前请求来源未在白名单中【"+ip+"】");
|
|
|
+ results.put("resultMessage", "当前请求来源未在白名单中【"+ip+"】");
|
|
|
return results;
|
|
|
}
|
|
|
if (mzDepositFile == null) {
|
|
@@ -1071,7 +1071,7 @@ public class MedicalViewApiController {
|
|
|
WhiteList whiteList=whiteListService.queryByIpAddress(ip);
|
|
|
if(whiteList==null){
|
|
|
results.put("resultCode", -1);
|
|
|
- results.put("message", "当前请求来源未在白名单中【"+ip+"】");
|
|
|
+ results.put("resultMessage", "当前请求来源未在白名单中【"+ip+"】");
|
|
|
return results;
|
|
|
}
|
|
|
mzPrescriptionVo.setJzFlag(YesNoEnum.NO.code);
|
|
@@ -1114,15 +1114,22 @@ public class MedicalViewApiController {
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/nucleicAcidApplication", method = {RequestMethod.GET})
|
|
|
- public Map<String, Object> nucleicAcidApplication(@RequestParam("patientId") String patientId) {
|
|
|
+ public Map<String, Object> nucleicAcidApplication(@RequestParam("patientId") String patientId, HttpServletRequest httpServletRequest) {
|
|
|
Map<String, Object> results = new HashMap<>();
|
|
|
try {
|
|
|
+ String ip=HttpUtil.getIPAddress(httpServletRequest);
|
|
|
+ WhiteList whiteList=whiteListService.queryByIpAddress(ip);
|
|
|
+ if(whiteList==null){
|
|
|
+ results.put("resultCode", -1);
|
|
|
+ results.put("resultMessage", "当前请求来源未在白名单中【"+ip+"】");
|
|
|
+ return results;
|
|
|
+ }
|
|
|
if (StringUtils.isBlank(patientId)) {
|
|
|
results.put("resultCode", -1);
|
|
|
results.put("resultMessage", "患者ID不能为空");
|
|
|
return results;
|
|
|
}
|
|
|
- Clinic clinic = mzChargeDetailService.nucleicAcidApplication(patientId);
|
|
|
+ Clinic clinic = mzChargeDetailService.nucleicAcidApplication(patientId,whiteList.getOpId());
|
|
|
if (clinic != null && clinic.getId() != null) {
|
|
|
results.put("resultCode", 0);
|
|
|
results.put("resultMessage", "核酸申请(单人单管)保存成功");
|
|
@@ -1153,15 +1160,22 @@ public class MedicalViewApiController {
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/hybridTestApplication", method = {RequestMethod.GET})
|
|
|
- public Map<String, Object> hybridTestApplication(@RequestParam("patientId") String patientId) {
|
|
|
+ public Map<String, Object> hybridTestApplication(@RequestParam("patientId") String patientId, HttpServletRequest httpServletRequest) {
|
|
|
Map<String, Object> results = new HashMap<>();
|
|
|
try {
|
|
|
+ String ip=HttpUtil.getIPAddress(httpServletRequest);
|
|
|
+ WhiteList whiteList=whiteListService.queryByIpAddress(ip);
|
|
|
+ if(whiteList==null){
|
|
|
+ results.put("resultCode", -1);
|
|
|
+ results.put("resultMessage", "当前请求来源未在白名单中【"+ip+"】");
|
|
|
+ return results;
|
|
|
+ }
|
|
|
if (StringUtils.isBlank(patientId)) {
|
|
|
results.put("resultCode", -1);
|
|
|
results.put("resultMessage", "患者ID不能为空");
|
|
|
return results;
|
|
|
}
|
|
|
- Clinic clinic = mzChargeDetailService.hybridTestApplication(patientId);
|
|
|
+ Clinic clinic = mzChargeDetailService.hybridTestApplication(patientId,whiteList.getOpId());
|
|
|
if (clinic != null && clinic.getId() != null) {
|
|
|
results.put("resultCode", 0);
|
|
|
results.put("resultMessage", "核酸申请(混检)保存成功");
|