This commit is contained in:
LiJianZhao 2025-04-25 17:03:00 +08:00
parent b03d146bb6
commit cfd2c96754
6 changed files with 155 additions and 99 deletions

View File

@ -182,7 +182,7 @@ public class SocialRequest {
httpUtil.call("2207A",im2207A.buildToMap());
}
public void call9001(IM9001 im9001){
httpUtil.call("9001","signIn",im9001.buildToMap());
public JSONObject call9001(IM9001 im9001){
return httpUtil.call("9001","signIn",im9001.buildToMap());
}
}

View File

@ -0,0 +1,34 @@
package com.syjiaer.clinic.server.controller.common;
import com.alibaba.fastjson2.JSONObject;
import com.syjiaer.clinic.server.common.annotations.NoAuthCheck;
import com.syjiaer.clinic.server.common.api.input.IM9001;
import com.syjiaer.clinic.server.common.api.request.SocialRequest;
import com.syjiaer.clinic.server.common.config.Config;
import com.syjiaer.clinic.server.common.util.RsaUtil;
import com.syjiaer.clinic.server.common.vo.Result;
import com.syjiaer.clinic.server.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/signUp")
public class SignUpController extends BaseController {
@Autowired
private Config config;
@Autowired
private SocialRequest socialRequest;
@RequestMapping("/signUp")
public Result<JSONObject> set() {
String id = infoUtil.getMap().get("manager_id").toString();
String mac = parmsUtil.getString("mac", "请输入mac地址");
String ip = parmsUtil.getString("ip", "请输入ip地址");
IM9001 im9001 = new IM9001();
im9001.setOpter_no(id);
im9001.setMac(mac);
im9001.setIp(ip);
return success(socialRequest.call9001(im9001));
}
}

View File

@ -13,7 +13,7 @@ import lombok.ToString;
import lombok.experimental.Accessors;
/**
* <p>
* icpc 就诊原因与疾病诊断1361
*
* </p>
*
* @author NiuZiYuan
@ -24,13 +24,14 @@ import lombok.experimental.Accessors;
@ToString
@Accessors(chain = true)
@TableName("social_icpc_diagnosis")
@ApiModel(value = "SocialIcpcDiagnosis对象", description = "icpc 就诊原因与疾病诊断1361")
@ApiModel(value = "SocialIcpcDiagnosis对象", description = "")
public class SocialIcpcDiagnosis implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(" 自增主键")
@TableId(value = "id", type = IdType.AUTO)
private String id;
private Integer id;
@ApiModelProperty("门诊诊疗编码")
private String name;
@ -63,5 +64,5 @@ public class SocialIcpcDiagnosis implements Serializable {
private LocalDateTime efftTime;
@ApiModelProperty("版本号")
private String var;
private String ver;
}

View File

@ -347,7 +347,9 @@ public class InventoryPurchaseService extends BaseService {
orderCode = inventory.getInventoryPurchaseCode();
InventoryLog log = inventoryService.adjustNumber(id,
0, inventory.getFragmentNumber(), "退货");
if (log.getChangeWholeNumber() < 0) {
if (log.getChangeWholeNumber() == 0){
return;
}else if (log.getChangeWholeNumber() < 0) {
log.setType(InventoryTypeEnum.RETURN_OUT.getType());
log.setSocialType(InventorySocialTypeEnum.OTHER_OUTBOUND.getType());

View File

@ -1,6 +1,7 @@
package com.syjiaer.clinic.server.service.social;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONException;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.syjiaer.clinic.server.common.util.DateUtil;
@ -13,6 +14,7 @@ import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView;
import com.syjiaer.clinic.server.mapper.social.SocialIcpcDiagnosisMapper;
import com.syjiaer.clinic.server.mapper.social.SocialIcpcDoctorDiagnoseMapper;
import com.syjiaer.clinic.server.service.BaseService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -21,6 +23,7 @@ import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
@Slf4j
@Service
public class SocialIcpcDiagnoseService extends BaseService {
@Autowired
@ -31,53 +34,61 @@ public class SocialIcpcDiagnoseService extends BaseService {
private SocialDirectoryVersionService socialDirectoryVersionService;
public String download(String pre_version_name) {
JSONArray jsonArray = httpUtil.download2(pre_version_name, 1361);
List<String> code_list = new ArrayList<>();
DateTimeFormatter dateTimeFormatter = DateUtil.getDateTimeFormatter(DateUtil.DATE_TIME_FORMAT);
List<SocialIcpcDiagnosis> list = new ArrayList<>();
for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
if (!jsonObject.getString("vali_flag").equals("1")) {
continue;
try {
JSONArray jsonArray = httpUtil.download2(pre_version_name, 1361);
List<String> code_list = new ArrayList<>();
DateTimeFormatter dateTimeFormatter = DateUtil.getDateTimeFormatter(DateUtil.DATE_TIME_FORMAT);
List<SocialIcpcDiagnosis> list = new ArrayList<>();
for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
if (!jsonObject.getString("vali_flag").equals("1")) {
continue;
}
SocialIcpcDiagnosis socialIcpcDiagnosis = new SocialIcpcDiagnosis();
socialIcpcDiagnosis.setName(jsonObject.getString("six_name"));
socialIcpcDiagnosis.setCode(jsonObject.getString("six_code"));
socialIcpcDiagnosis.setIcd10AsocName(jsonObject.getString("icd10_asoc_name"));
socialIcpcDiagnosis.setTrtType(jsonObject.getString("trt_type"));
if (jsonObject.getString("invd_time") != null && !jsonObject.getString("invd_time").isEmpty()) {
socialIcpcDiagnosis.setInvdTime(LocalDateTime.parse(jsonObject.getString("invd_time"), dateTimeFormatter));
} else {
socialIcpcDiagnosis.setInvdTime(null);
}
socialIcpcDiagnosis.setMemo(jsonObject.getString("memo"));
socialIcpcDiagnosis.setRid(jsonObject.getString("rid"));
if (jsonObject.getString("updt_time") != null && !jsonObject.getString("updt_time").isEmpty()) {
socialIcpcDiagnosis.setUpdtTime(LocalDateTime.parse(jsonObject.getString("updt_time"), dateTimeFormatter));
} else {
socialIcpcDiagnosis.setUpdtTime(null);
}
if (jsonObject.getString("crte_time") != null && !jsonObject.getString("crte_time").isEmpty()) {
socialIcpcDiagnosis.setCrteTime(LocalDateTime.parse(jsonObject.getString("crte_time"), dateTimeFormatter));
} else {
socialIcpcDiagnosis.setCrteTime(null);
}
if (jsonObject.getString("efft_time") != null && !jsonObject.getString("efft_time").isEmpty()) {
socialIcpcDiagnosis.setEfftTime(LocalDateTime.parse(jsonObject.getString("efft_time"), dateTimeFormatter));
} else {
socialIcpcDiagnosis.setEfftTime(null);
}
socialIcpcDiagnosis.setVer(jsonObject.getString("ver"));
list.add(socialIcpcDiagnosis);
code_list.add(socialIcpcDiagnosis.getCode());
}
SocialIcpcDiagnosis socialIcpcDiagnosis = new SocialIcpcDiagnosis();
socialIcpcDiagnosis.setId(jsonObject.getString("six_code"));
socialIcpcDiagnosis.setName(jsonObject.getString("six_name"));
socialIcpcDiagnosis.setCode(jsonObject.getString("six_code"));
socialIcpcDiagnosis.setIcd10AsocName(jsonObject.getString("icd10_asoc_name"));
socialIcpcDiagnosis.setTrtType(jsonObject.getString("trt_type"));
if (jsonObject.getString("invd_time") != null && !jsonObject.getString("invd_time").isEmpty()) {
socialIcpcDiagnosis.setInvdTime(LocalDateTime.parse(jsonObject.getString("invd_time"), dateTimeFormatter));
} else {
socialIcpcDiagnosis.setInvdTime(null);
}
socialIcpcDiagnosis.setMemo(jsonObject.getString("memo"));
socialIcpcDiagnosis.setRid(jsonObject.getString("rid"));
if (jsonObject.getString("updt_time") != null && !jsonObject.getString("updt_time").isEmpty()) {
socialIcpcDiagnosis.setUpdtTime(LocalDateTime.parse(jsonObject.getString("updt_time"), dateTimeFormatter));
} else {
socialIcpcDiagnosis.setUpdtTime(null);
}
if (jsonObject.getString("crte_time") != null && !jsonObject.getString("crte_time").isEmpty()) {
socialIcpcDiagnosis.setCrteTime(LocalDateTime.parse(jsonObject.getString("crte_time"), dateTimeFormatter));
} else {
socialIcpcDiagnosis.setCrteTime(null);
}
if (jsonObject.getString("efft_time") != null && !jsonObject.getString("efft_time").isEmpty()) {
socialIcpcDiagnosis.setEfftTime(LocalDateTime.parse(jsonObject.getString("efft_time"), dateTimeFormatter));
} else {
socialIcpcDiagnosis.setEfftTime(null);
}
socialIcpcDiagnosis.setVar(jsonObject.getString("var"));
list.add(socialIcpcDiagnosis);
code_list.add(socialIcpcDiagnosis.getCode());
QueryWrapper<SocialIcpcDiagnosis> queryWrapper = new QueryWrapper<>();
queryWrapper.in("code", code_list);
socialIcpcDiagnosisMapper.delete(queryWrapper);
socialIcpcDiagnosisMapper.insert(list, 100);
socialDirectoryVersionService.saveVersion(1361, pre_version_name, list.get(0).getVer(), list.size());
return list.get(0).getVer();
}catch (JSONException e){
log.error(e.toString());
return null;
}
QueryWrapper<SocialIcpcDiagnosis> queryWrapper = new QueryWrapper<>();
queryWrapper.in("code", code_list);
socialIcpcDiagnosisMapper.delete(queryWrapper);
socialIcpcDiagnosisMapper.insert(list, 100);
socialDirectoryVersionService.saveVersion(1361, pre_version_name, list.get(0).getVar(), list.size());
return list.get(0).getVar();
}
public Page<SocialIcpcDiagnosis> getDocList(int type, int page, int size, String keyword) {

View File

@ -1,6 +1,7 @@
package com.syjiaer.clinic.server.service.social;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONException;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fasterxml.jackson.databind.ObjectMapper;
@ -12,6 +13,7 @@ import com.syjiaer.clinic.server.entity.social.SocialIcpcItem;
import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView;
import com.syjiaer.clinic.server.mapper.social.SocialIcpcItemMapper;
import com.syjiaer.clinic.server.service.BaseService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -21,7 +23,7 @@ import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@Slf4j
@Service
public class SocialIcpcItemService extends BaseService {
@Autowired
@ -31,55 +33,61 @@ public class SocialIcpcItemService extends BaseService {
@Autowired
private SocialDirectoryVersionService socialDirectoryVersionService;
public String download(String pre_version_name) {
JSONArray jsonArray = httpUtil.download2(pre_version_name, 1362);
List<String> code_list = new ArrayList<>();
DateTimeFormatter dateTimeFormatter = DateUtil.getDateTimeFormatter(DateUtil.DATE_TIME_FORMAT);
List<SocialIcpcItem> list = new ArrayList<>();
for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
if (!jsonObject.getString("vali_flag").equals("1")) {
continue;
}
SocialIcpcItem socialIcpcItem = new SocialIcpcItem();
socialIcpcItem.setChrgitmProvCode(jsonObject.getString("chrgitm_prov_code"));
socialIcpcItem.setCode(jsonObject.getString("chrgitm_nat_code"));
socialIcpcItem.setName(jsonObject.getString("chrgitm_name"));
socialIcpcItem.setIcpcCode(jsonObject.getString("icpc_code"));
socialIcpcItem.setIcpcCodeFlag(jsonObject.getString("icpc_code_flag"));
socialIcpcItem.setChrgitmAttr(jsonObject.getString("chrgitm_attr"));
if (jsonObject.getString("efft_time") != null && !jsonObject.getString("efft_time").isEmpty()) {
socialIcpcItem.setEfftTime(LocalDateTime.parse(jsonObject.getString("efft_time"), dateTimeFormatter));
} else {
socialIcpcItem.setEfftTime(null);
}
try {
JSONArray jsonArray = httpUtil.download2(pre_version_name, 1362);
List<String> code_list = new ArrayList<>();
DateTimeFormatter dateTimeFormatter = DateUtil.getDateTimeFormatter(DateUtil.DATE_TIME_FORMAT);
List<SocialIcpcItem> list = new ArrayList<>();
for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
if (!jsonObject.getString("vali_flag").equals("1")) {
continue;
}
SocialIcpcItem socialIcpcItem = new SocialIcpcItem();
socialIcpcItem.setChrgitmProvCode(jsonObject.getString("chrgitm_prov_code"));
socialIcpcItem.setCode(jsonObject.getString("chrgitm_nat_code"));
socialIcpcItem.setName(jsonObject.getString("chrgitm_name"));
socialIcpcItem.setIcpcCode(jsonObject.getString("icpc_code"));
socialIcpcItem.setIcpcCodeFlag(jsonObject.getString("icpc_code_flag"));
socialIcpcItem.setChrgitmAttr(jsonObject.getString("chrgitm_attr"));
if (jsonObject.getString("efft_time") != null && !jsonObject.getString("efft_time").isEmpty()) {
socialIcpcItem.setEfftTime(LocalDateTime.parse(jsonObject.getString("efft_time"), dateTimeFormatter));
} else {
socialIcpcItem.setEfftTime(null);
}
if (jsonObject.getString("invd_time") != null && !jsonObject.getString("invd_time").isEmpty()) {
socialIcpcItem.setInvdTime(LocalDateTime.parse(jsonObject.getString("invd_time"), dateTimeFormatter));
} else {
socialIcpcItem.setInvdTime(null);
if (jsonObject.getString("invd_time") != null && !jsonObject.getString("invd_time").isEmpty()) {
socialIcpcItem.setInvdTime(LocalDateTime.parse(jsonObject.getString("invd_time"), dateTimeFormatter));
} else {
socialIcpcItem.setInvdTime(null);
}
socialIcpcItem.setRid(jsonObject.getString("rid"));
socialIcpcItem.setMemo(jsonObject.getString("memo"));
if (jsonObject.getString("updt_time") != null && !jsonObject.getString("updt_time").isEmpty()) {
socialIcpcItem.setUpdtTime(LocalDateTime.parse(jsonObject.getString("updt_time"), dateTimeFormatter));
} else {
socialIcpcItem.setUpdtTime(null);
}
if (jsonObject.getString("crte_time") != null && !jsonObject.getString("crte_time").isEmpty()) {
socialIcpcItem.setCrteTime(LocalDateTime.parse(jsonObject.getString("crte_time"), dateTimeFormatter));
} else {
socialIcpcItem.setCrteTime(null);
}
socialIcpcItem.setVer(jsonObject.getString("ver"));
list.add(socialIcpcItem);
code_list.add(socialIcpcItem.getCode());
}
socialIcpcItem.setRid(jsonObject.getString("rid"));
socialIcpcItem.setMemo(jsonObject.getString("memo"));
if (jsonObject.getString("updt_time") != null && !jsonObject.getString("updt_time").isEmpty()) {
socialIcpcItem.setUpdtTime(LocalDateTime.parse(jsonObject.getString("updt_time"), dateTimeFormatter));
} else {
socialIcpcItem.setUpdtTime(null);
}
if (jsonObject.getString("crte_time") != null && !jsonObject.getString("crte_time").isEmpty()) {
socialIcpcItem.setCrteTime(LocalDateTime.parse(jsonObject.getString("crte_time"), dateTimeFormatter));
} else {
socialIcpcItem.setCrteTime(null);
}
socialIcpcItem.setVer(jsonObject.getString("ver"));
list.add(socialIcpcItem);
code_list.add(socialIcpcItem.getCode());
QueryWrapper<SocialIcpcItem> queryWrapper = new QueryWrapper<>();
queryWrapper.in("code", code_list);
socialIcpcItemMapper.delete(queryWrapper);
socialIcpcItemMapper.insert(list, 100);
socialDirectoryVersionService.saveVersion(1362, pre_version_name, list.get(0).getVer(), list.size());
return list.get(0).getVer();
}catch (JSONException e){
log.error(e.toString());
return null;
}
QueryWrapper<SocialIcpcItem> queryWrapper = new QueryWrapper<>();
queryWrapper.in("code", code_list);
socialIcpcItemMapper.delete(queryWrapper);
socialIcpcItemMapper.insert(list, 100);
socialDirectoryVersionService.saveVersion(1362, pre_version_name, list.get(0).getVer(), list.size());
return list.get(0).getVer();
}
public Page<SocialIcpcItem> getDocList(int type, int page, int size, String keyword) {