clinic-v2
/
server
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: clinic-v2:26c222bd40dbe0f34ff0451e182c19f086c2796b
Branches Tags
clinic-v2:master
clinic-v2:fea_tongmingxuan_xinjiangbushu
..
compare: clinic-v2:e456844d917fe73fec338b6569ee79da3a70fef9
Branches Tags
clinic-v2:fea_tongmingxuan_xinjiangbushu
clinic-v2:master

No commits in common. "26c222bd40dbe0f34ff0451e182c19f086c2796b" and "e456844d917fe73fec338b6569ee79da3a70fef9" have entirely different histories.
26c222bd40 ... e456844d91

15 changed files with 31 additions and 95 deletions
Show Stats Expand all files Collapse all files

14
src/main/java/com/syjiaer/clinic/server/common/api/request/SocialRequest.java
View File

@ -4,7 +4,6 @@ import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.syjiaer.clinic.server.common.api.input.*;
import com.syjiaer.clinic.server.common.api.output.*;
import com.syjiaer.clinic.server.common.util.DebugUtil;
import com.syjiaer.clinic.server.common.util.HttpUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@ -22,40 +21,40 @@ public class SocialRequest {
om1101.setBaseinfo(JSONObject.parseObject(data.get("baseinfo").toString(), OM1101.Baseinfo.class));
om1101.setInsuinfo(JSONArray.parseArray(data.get("insuinfo").toString(), OM1101.Insuinfo.class));
om1101.setIDetinfo(JSONArray.parseArray(data.get("idetinfo").toString(), OM1101.Idetinfo.class));
DebugUtil.out("data:"+data);
System.out.println("data:"+data);
return om1101;
}
public OM1301 call1301(IM1301 im1301) {
JSONObject jsonObject=httpUtil.call("1301", "data", im1301.buildToMap());
DebugUtil.out(jsonObject);
System.out.println(jsonObject);
OM1301 om1301=new OM1301();
om1301.makeFromJson(jsonObject);
return om1301;
}
public OM1302 call1302(IM1302 im1302) {
JSONObject jsonObject=httpUtil.call("1302", "data", im1302.buildToMap());
DebugUtil.out(jsonObject);
System.out.println(jsonObject);
OM1302 om1302=new OM1302();
om1302.makeFromJson(jsonObject);
return om1302;
}
public OM1305 call1305(IM1305 im1305) {
JSONObject jsonObject=httpUtil.call("1305", "data", im1305.buildToMap());
DebugUtil.out(jsonObject);
System.out.println(jsonObject);
OM1305 om1305=new OM1305();
om1305.makeFromJson(jsonObject);
return om1305;
}
public OM1306 call1306(IM1306 im1306) {
JSONObject jsonObject=httpUtil.call("1306", "data", im1306.buildToMap());
DebugUtil.out(jsonObject);
System.out.println(jsonObject);
OM1306 om1306=new OM1306();
om1306.makeFromJson(jsonObject);
return om1306;
}
public OM1307 call1307(IM1307 im1307) {
JSONObject jsonObject=httpUtil.call("1307", "data", im1307.buildToMap());
DebugUtil.out(jsonObject);
System.out.println(jsonObject);
OM1307 om1307=new OM1307();
om1307.makeFromJson(jsonObject);
return om1307;
@ -63,6 +62,7 @@ public class SocialRequest {
public OM1309 call1309(IM1309 im1309) {
JSONObject jsonObject=httpUtil.call("1309", "data", im1309.buildToMap());
System.out.println();
OM1309 om1309=new OM1309();
om1309.makeFromJson(jsonObject);
return om1309;

31
src/main/java/com/syjiaer/clinic/server/common/util/DebugUtil.java
View File

@ -1,31 +0,0 @@
package com.syjiaer.clinic.server.common.util;
import java.util.Properties;
public class DebugUtil {
private static long startTime;
// 标记开始点
public static void start() {
startTime = System.nanoTime();
}
// 标记结束点并返回执行时间（秒，保留三位小数）
public static String end() {
long endTime = System.nanoTime();
double duration = (endTime - startTime) / 1_000_000_000.0; // 转换为秒
return String.format("%.3f", duration);
}
public static void out(Object object){
if(object==null){
System.out.println("null");
}
String isDev = System.getenv("IsDev");
if (isDev != null &&isDev.equals("true")) {
System.out.println(object);
}
}
}

7
src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryMapper.java
View File

@ -22,12 +22,5 @@ public interface SocialDirectoryMapper extends BaseMapper<SocialDirectory> {
List<SocialDirectoryView> selectSocialDirectoryView(@Param("codeList") List<String> codeList);
@Select("select * from social_directory where code = #{code}")
SocialDirectory getByCode(@Param("code") String code);
void insertAll(List<SocialDirectory> list);
}

3
src/main/java/com/syjiaer/clinic/server/service/common/ManagerUserService.java
View File

@ -6,7 +6,6 @@ import com.syjiaer.clinic.server.common.api.input.IM9001;
import com.syjiaer.clinic.server.common.api.input.IM9002;
import com.syjiaer.clinic.server.common.api.request.SocialRequest;
import com.syjiaer.clinic.server.common.exception.MessageException;
import com.syjiaer.clinic.server.common.util.DebugUtil;
import com.syjiaer.clinic.server.controller.BaseController;
import com.syjiaer.clinic.server.entity.manager.ManagerUser;
import com.syjiaer.clinic.server.entity.manager.ManagerUserSign;
@ -44,7 +43,7 @@ public class ManagerUserService extends BaseService {
throw new MessageException("用户名或密码错误");
}
Date exdata = new Date(System.currentTimeMillis() + jwtExpiration * 1000);
DebugUtil.out(exdata);
System.out.println(exdata);
SecretKey key = Keys.hmacShaKeyFor(jwtSecret.getBytes());
String token = Jwts.builder()
.subject(managerUser.getId().toString()) // 用户ID作为主题

3
src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java
View File

@ -9,7 +9,6 @@ import com.syjiaer.clinic.server.common.config.Config;
import com.syjiaer.clinic.server.common.constants.Constants;
import com.syjiaer.clinic.server.common.enums.RegistrationStatusEnum;
import com.syjiaer.clinic.server.common.exception.MessageException;
import com.syjiaer.clinic.server.common.util.DebugUtil;
import com.syjiaer.clinic.server.common.util.StringUtil;
import com.syjiaer.clinic.server.common.vo.Page;
import com.syjiaer.clinic.server.entity.charge.vo.ChargeGoodsListVo;
@ -201,7 +200,7 @@ public class MedicalRecordService extends BaseService {
patientInfoMapper.updateById(updatePatient);
DebugUtil.out(saveDto.getDiagnosisMedicalRecord().getDiagnosisDetail());
System.out.println(saveDto.getDiagnosisMedicalRecord().getDiagnosisDetail());
List<SocialDiagnose> diagnoseList = JSONArray.parseArray(saveDto.getDiagnosisMedicalRecord().getDiagnosisDetail(),SocialDiagnose.class);
socialDiagnoseService.updateNumAddOne(diagnoseList);
itemService.updateNumAddOne(itemIds);

5
src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryPurchaseService.java
View File

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.syjiaer.clinic.server.common.constants.Constants;
import com.syjiaer.clinic.server.common.enums.*;
import com.syjiaer.clinic.server.common.exception.MessageException;
import com.syjiaer.clinic.server.common.util.DebugUtil;
import com.syjiaer.clinic.server.common.util.HttpUtil;
import com.syjiaer.clinic.server.common.vo.Page;
import com.syjiaer.clinic.server.entity.goods.Goods;
@ -448,7 +447,7 @@ public class InventoryPurchaseService extends BaseService {
QueryWrapper<Goods> goodsWrapper = new QueryWrapper<>();
goodsWrapper.in("cate_id", cateIdList);
List<Goods> goodsList = goodsMapper.selectList(goodsWrapper);
DebugUtil.out(goodsList);
System.out.println(goodsList);
/*
表格拼接字段映射
@ -521,7 +520,7 @@ public class InventoryPurchaseService extends BaseService {
outFile.close();
inputStream.close();
fileName=file.getAbsolutePath();
DebugUtil.out("Excel文件生成成功！");
System.out.println("Excel文件生成成功！");
} catch (IOException e) {
logger.warning(e.getMessage());
throw new MessageException("excel创建失败");

7
src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java
View File

@ -8,7 +8,6 @@ import com.syjiaer.clinic.server.common.enums.InventoryTypeEnum;
import com.syjiaer.clinic.server.common.enums.Type;
import com.syjiaer.clinic.server.common.enums.UploadStatusEnum;
import com.syjiaer.clinic.server.common.exception.MessageException;
import com.syjiaer.clinic.server.common.util.DebugUtil;
import com.syjiaer.clinic.server.common.vo.Page;
import com.syjiaer.clinic.server.entity.goods.Goods;
import com.syjiaer.clinic.server.entity.inventory.Inventory;
@ -180,7 +179,7 @@ public class InventoryService extends BaseService {
endLine.setSellingPrice(endLine.getSellingPrice().add(goods.getUnitPrice().multiply(new BigDecimal(lastLog.getAfterWholeNumber()))));
} else {
endLine.setSellingPrice(endLine.getSellingPrice().add(goods.getDisassemblyPrice().multiply(new BigDecimal(afterLogFragmentNumber))));
DebugUtil.out(endLine.getSellingPrice());
System.out.println(endLine.getSellingPrice());
}
for (InventoryLog inventoryLog : InventoryLogList) {
if (inventoryLog.getType() == 1) {
@ -441,9 +440,9 @@ public class InventoryService extends BaseService {
}
int minPackaging = goods.getMinPackagingNumber();
DebugUtil.out("inventory");
System.out.println("inventory");
// 3. 计算总库存量（转换为最小单位）
DebugUtil.out(inventory);
System.out.println(inventory);
int currentTotal = inventory.getWholeNumber() * minPackaging + inventory.getFragmentNumber();
int deductTotal = changeWholeNumber * minPackaging + changeFragmentNumber;

5
src/main/java/com/syjiaer/clinic/server/service/patient/PatientInfoService.java
View File

@ -3,7 +3,6 @@ package com.syjiaer.clinic.server.service.patient;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.syjiaer.clinic.server.common.exception.MessageException;
import com.syjiaer.clinic.server.common.util.DebugUtil;
import com.syjiaer.clinic.server.common.vo.Page;
import com.syjiaer.clinic.server.entity.patient.PatientInfo;
import com.syjiaer.clinic.server.entity.vip.Vip;
@ -108,8 +107,8 @@ public class PatientInfoService extends BaseService {
for (VipLevelConfig vipLevelConfig : vipLevelConfigs) {
if(end_exp>=vipLevelConfig.getStartExp()){
patientInfo.setLevelId(vipLevelConfig.getLevelId());
DebugUtil.out(vipLevelConfig.getLevelId());
DebugUtil.out(end_exp);
System.out.println(vipLevelConfig.getLevelId());
System.out.println(end_exp);
break;
}
}

2
src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryLimitService.java
View File

@ -4,7 +4,6 @@ import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.syjiaer.clinic.server.common.api.request.SocialRequest;
import com.syjiaer.clinic.server.common.util.DebugUtil;
import com.syjiaer.clinic.server.common.util.HttpUtil;
import com.syjiaer.clinic.server.entity.social.SocialDirectoryLimit;
import com.syjiaer.clinic.server.mapper.social.SocialDirectoryLimitMapper;
@ -39,6 +38,7 @@ public class SocialDirectoryLimitService {
public Map<String, Object> getPage(String updtTime, int pageNum) {
JSONObject result = call(updtTime, pageNum);
System.out.println(result);
int recordCounts = result.getInteger("recordCounts");
int pages = result.getInteger("pages");
JSONArray json_list = result.getJSONArray("data");

2
src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectorySelfService.java
View File

@ -4,7 +4,6 @@ import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.syjiaer.clinic.server.common.api.request.SocialRequest;
import com.syjiaer.clinic.server.common.util.DebugUtil;
import com.syjiaer.clinic.server.common.util.HttpUtil;
import com.syjiaer.clinic.server.entity.social.SocialDirectorySelf;
import com.syjiaer.clinic.server.mapper.social.SocialDirectorySelfMapper;
@ -39,6 +38,7 @@ public class SocialDirectorySelfService {
public Map<String, Object> getPage(String updtTime, int pageNum) {
JSONObject result = call(updtTime, pageNum);
System.out.println(result);
int recordCounts = result.getInteger("recordCounts");
int pages = result.getInteger("pages");
JSONArray json_list = result.getJSONArray("data");

29
src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java
View File

@ -69,6 +69,7 @@ public class SocialDirectoryService extends BaseService {
* @param version_name 版本名称
* @param type 类型
*/
@Transactional(rollbackFor = Exception.class)
public String download(String version_name, int type) {
List<String[]> tab_list = httpUtil.download(version_name, type);
if (tab_list.isEmpty()) {
@ -164,21 +165,14 @@ public class SocialDirectoryService extends BaseService {
if (next_version_name.isEmpty()) {
return next_version_name;
}
socialDirectoryVersionService.saveVersion(type, version_name, next_version_name, list.size());
if (list.isEmpty()) {
socialDirectoryVersionService.saveVersion(type, version_name, next_version_name, list.size());
return null;
}else{
for (int i = 0; i < list.size(); i += 1000) {
List<SocialDirectory> subList = list.subList(i, Math.min(i + 1000, list.size()));
socialDirectoryMapper.insertAll(subList);
}
socialDirectoryVersionService.saveVersion(type, version_name, next_version_name, list.size());
}
socialDirectoryMapper.insert(list, 100);
initMongoDb();
saveListToMongoDb(list);
return next_version_name;
}
@ -201,28 +195,21 @@ public class SocialDirectoryService extends BaseService {
private void saveListToMongoDb(List<SocialDirectory> list) {
//取出list中所有的code为一个数组
List<String> codes = list.stream().map(SocialDirectory::getCode).collect(Collectors.toList());
//批量删除code中对应的所有数据
mongoTemplate.remove(new Query(Criteria.where("code").in(codes)), "social_directory");
for (int i = 0; i < list.size(); i += 1000) {
List<SocialDirectory> subList = list.subList(i, Math.min(i + 1000, list.size()));
mongoTemplate.insert(subList, "social_directory");
for (SocialDirectory socialDirectory : list) {
saveToMongoDb(socialDirectory);
}
}
private void initMongoDb() {
if (!mongoTemplate.collectionExists("social_directory")) {
DebugUtil.out("创建了social_directory集合");
System.out.println("创建了social_directory集合");
mongoTemplate.createCollection("social_directory");
}
List<IndexInfo> indexInfos = mongoTemplate.indexOps("social_directory").getIndexInfo();
//判断索引是否存在
if (indexInfos.stream().noneMatch(index -> index.getName().equals("code_uni"))) {
DebugUtil.out("创建了code索引");
System.out.println("创建了code索引");
Index index = new Index().on("code", Sort.Direction.ASC).named("code_uni").unique();
mongoTemplate.indexOps("social_directory").ensureIndex(index);
}

2
src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryUpinfoService.java
View File

@ -8,7 +8,6 @@ import com.syjiaer.clinic.server.common.api.output.OM1312;
import com.syjiaer.clinic.server.common.api.request.SocialRequest;
import com.syjiaer.clinic.server.common.exception.MessageException;
import com.syjiaer.clinic.server.common.util.DateUtil;
import com.syjiaer.clinic.server.common.util.DebugUtil;
import com.syjiaer.clinic.server.common.util.HttpUtil;
import com.syjiaer.clinic.server.entity.social.SocialDirectoryUpinfo;
import com.syjiaer.clinic.server.mapper.social.SocialDirectoryUpinfoMapper;
@ -48,6 +47,7 @@ public class SocialDirectoryUpinfoService {
public Map<String, Object> getPage(String updtTime, int pageNum) {
JSONObject result = call(updtTime, pageNum);
System.out.println(result);
int recordCounts = result.getInteger("recordCounts");
int pages = result.getInteger("pages");
JSONArray json_list = result.getJSONArray("data");

5
src/main/java/com/syjiaer/clinic/server/service/vip/VipService.java
View File

@ -3,7 +3,6 @@ package com.syjiaer.clinic.server.service.vip;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.syjiaer.clinic.server.common.exception.MessageException;
import com.syjiaer.clinic.server.common.util.DebugUtil;
import com.syjiaer.clinic.server.common.vo.Page;
import com.syjiaer.clinic.server.entity.vip.Vip;
import com.syjiaer.clinic.server.entity.vip.VipExpLog;
@ -101,8 +100,8 @@ public class VipService extends BaseService {
for (VipLevelConfig vipLevelConfig : vipLevelConfigs) {
if(end_exp>=vipLevelConfig.getStartExp()){
vip.setLevelId(vipLevelConfig.getLevelId());
DebugUtil.out(vipLevelConfig.getLevelId());
DebugUtil.out(end_exp);
System.out.println(vipLevelConfig.getLevelId());
System.out.println(end_exp);
break;
}
}

2
src/main/resources/application.yml
View File

@ -19,7 +19,7 @@ spring:
server:
port: 8088
common:
isdev: false
isdev: true
jwt:
secret: Lrhcnqby4UiFnFqQIWGp8051odVDtqEHaMeDvdzwGhsUPa2nEUAPrlPHTKaABWoM
expiration: 86400

7
src/main/resources/xml/SocialDirectoryMapper.xml
View File

@ -1,13 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.syjiaer.clinic.server.mapper.social.SocialDirectoryMapper">
<insert id="insertAll">
INSERT INTO social_directory (id,code, name, keyword, type, producer, create_datetime, update_datetime, version_name, data)
VALUES
<foreach collection="list" item="item" separator=",">
(#{item.id},#{item.code},#{item.name},#{item.keyword},#{item.type},#{item.producer},#{item.createDatetime},#{item.updateDatetime},#{item.versionName},#{item.data})
</foreach>
</insert>
<select id="selectSocialDirectoryView"