增加接口文档注释

blood_bus/src/main/java/com/czblood/bus/mapper/XkPatientInfoMapper.java

@@ -9,4 +9,5 @@ public interface XkPatientInfoMapper {
     void insertXkPatientInfo(XkPatientInfo xkPatientInfo);
     void deleteXkPatientInfo(String beinhos_id);
     void updateXkPatientInfo(XkPatientInfo xkPatientInfo);
+    XkPatientInfo queryOne(String beinhos_id);
 }

blood_bus/src/main/java/com/czblood/bus/pojo/ReportParam.java

@@ -1,5 +1,6 @@
 package com.czblood.bus.pojo;
 
+import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -9,6 +10,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@ApiModel("打印入参")
 public class ReportParam {
     private String billNo;
     private String beinhosId;

blood_bus/src/main/java/com/czblood/bus/pojo/XkBloodBreed.java

@@ -1,5 +1,7 @@
 package com.czblood.bus.pojo;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -10,9 +12,13 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@ApiModel("血液品种")
 public class XkBloodBreed {
+    @ApiModelProperty("血液品种代码")
     private String breed_code;
+    @ApiModelProperty("血液品种名称")
     private String breed_name;
+    @ApiModelProperty("血液品种大类")
     private String blood_kind;
     private String breed_yard;
     private String breed_liquid;

blood_bus/src/main/java/com/czblood/bus/pojo/XkHosInfo.java

@@ -1,5 +1,6 @@
 package com.czblood.bus.pojo;
 
+import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -7,6 +8,7 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@ApiModel(("医院信息"))
 public class XkHosInfo {
     private String hospital_code;
     private String hospital_name;

blood_bus/src/main/java/com/czblood/bus/pojo/XkOperatorInfo.java

@@ -1,5 +1,6 @@
 package com.czblood.bus.pojo;
 
+import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -7,6 +8,7 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@ApiModel("员工信息表")
 public class XkOperatorInfo {
     private String operator_id;
     private String operator_name;

blood_bus/src/main/java/com/czblood/bus/pojo/XkParameter.java

@@ -1,5 +1,6 @@
 package com.czblood.bus.pojo;
 
+import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -9,6 +10,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@ApiModel("系统参数")
 public class XkParameter {
     private String parameter_code;
     private String module_code;

blood_bus/src/main/java/com/czblood/bus/pojo/XkTransfuseApplyApproval.java

@@ -1,5 +1,6 @@
 package com.czblood.bus.pojo;
 
+import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -10,6 +11,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@ApiModel("大量用血审批")
 public class XkTransfuseApplyApproval {
     private String Bill_No;
     private String Archiater;

blood_bus/src/main/java/com/czblood/bus/pojo/XkTransfuseApplyBefore.java

@@ -1,5 +1,7 @@
 package com.czblood.bus.pojo;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -10,24 +12,42 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@ApiModel("输血前评估")
 public class XkTransfuseApplyBefore {
+    @ApiModelProperty("单据编号")
     private String bill_no;
+    @ApiModelProperty("住院号")
     private String beinhos_id;
+    @ApiModelProperty("科室ID")
     private String dept_id;
+    @ApiModelProperty("病区ID")
     private String zone_id;
+    @ApiModelProperty("是否签署同意书")
     private String agreement_ink;
+    @ApiModelProperty("出血量")
     private BigDecimal blood_loss;
+    @ApiModelProperty("申请时间")
     private Date assess_data;
+    @ApiModelProperty("申请人")
     private String assess_person;
+    @ApiModelProperty("申请血液品种")
     private String blood_breed;
+    @ApiModelProperty("申请血量")
     private BigDecimal blood_num;
+    @ApiModelProperty("申请单位")
     private String unit;
+    @ApiModelProperty("输血目的")
     private String intent;
+    @ApiModelProperty("诊断")
     private String diagnoses;
+    @ApiModelProperty("病人床号")
     private String patient_bed;
+    @ApiModelProperty("贫血程度")
     private String anemia;
     private String metabolism;
     private String cruor;
+    @ApiModelProperty("病情概要")
     private String bqgy;
+    @ApiModelProperty("医疗机构ID")
     private String hos_id;
 }

blood_bus/src/main/java/com/czblood/bus/pojo/XkTransfuseApplyBloodbreed.java

@@ -1,5 +1,7 @@
 package com.czblood.bus.pojo;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -9,18 +11,28 @@ import java.math.BigDecimal;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@ApiModel("输血申请单品种")
 public class XkTransfuseApplyBloodbreed {
+    @ApiModelProperty("单据编号")
     private String bill_no;
+    @ApiModelProperty("血液品种")
     private String blood_breed;
+    @ApiModelProperty("申请输血量")
     private BigDecimal blood_num;
+    @ApiModelProperty("申请单位")
     private String unit;
+    @ApiModelProperty("特殊处理")
     private String special_deal;
     private BigDecimal onetime_num;
+    @ApiModelProperty("备注")
     private String remark;
+    @ApiModelProperty("替代品种")
     private String replace_bloodbreed;
     private String apply_bloodtype;
     private BigDecimal ops_bleeding;
     private BigDecimal ops_fact_use;
+    @ApiModelProperty("输血目的")
     private String intent;
+    @ApiModelProperty("输血指征")
     private String causalis;
 }

blood_bus/src/main/java/com/czblood/bus/pojo/XkTransfuseApplyCausalis.java

@@ -1,5 +1,7 @@
 package com.czblood.bus.pojo;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -7,15 +9,25 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@ApiModel("输血指征")
 public class XkTransfuseApplyCausalis {
+    @ApiModelProperty("输血申请单编号")
     private String Bill_No;
+    @ApiModelProperty("医疗机构ID")
     private String Hos_ID;
     private Integer SID;
+    @ApiModelProperty("输血指征代码")
     private String Causalis_Code;
+    @ApiModelProperty("输血指征类别")
     private String Causalis_Type;
+    @ApiModelProperty("输血指征名称")
     private String Causalis_Name;
+    @ApiModelProperty("输血指征结果标志")
     private String Causalis_Result;
+    @ApiModelProperty("使用标志")
     private String Use_Flag;
+    @ApiModelProperty("上传标志")
     private String Upload_Flag;
+    @ApiModelProperty("备注说明")
     private String Explain;
 }

blood_bus/src/main/java/com/czblood/bus/pojo/XkTransfuseApplyTestitem.java

@@ -1,5 +1,7 @@
 package com.czblood.bus.pojo;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -9,12 +11,21 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@ApiModel("输血申请单检验项目")
 public class XkTransfuseApplyTestitem {
+    @ApiModelProperty("单据编号")
     private String bill_no;
     private Integer sid;
+    @ApiModelProperty("检验项目名称")
     private String item_name;
+    @ApiModelProperty("检验项目结果")
     private String item_result;
+    @ApiModelProperty("检验项目单位")
     private String Item_unit;
+    @ApiModelProperty("检验项目时间")
     private Date test_date;
+    @ApiModelProperty("上传标志")
     private String upload_flag;
+    @ApiModelProperty("医疗机构ID")
+    private String hos_id;
 }

blood_bus/src/main/java/com/czblood/bus/pojo/XkXtwhIll.java

@@ -0,0 +1,17 @@
+package com.czblood.bus.pojo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("单病种")
+public class XkXtwhIll {
+    private String Ill_Code;
+    private String Ill_Name;
+    private String Use_Sign;
+    private String Remark;
+}

blood_bus/src/main/java/com/czblood/bus/utils/BloodBankUtil.java

@@ -94,8 +94,9 @@ public class BloodBankUtil {
         if(parameterCache == null){
             XkParameter xkParameter = xkParameterMapper.queryOne(parameterCode);
             return xkParameter.getParameter_value();
+        }else{
+            return parameterCache.getParameter_value();
         }
-        return "";
     }
 
 
@@ -115,6 +116,11 @@ public class BloodBankUtil {
         }
     }
 
+    /**
+     * 根据单据类型生成单据编号
+     * @param type
+     * @return
+     */
     public String produceBillNo(String type){
         String formatDate = DateUtil.format(commonUtil.getCurrentTimeDate(), "yyyyMMdd");
         return type + formatDate + getMaxValue();

blood_bus/src/main/resources/mapper/XkDmzdMapper.xml

@@ -11,6 +11,7 @@
         <if test="exp3 != null and exp3 != ''">exp3=#{exp3},</if>
         <if test="exp4 != null and exp4 != ''">exp4=#{exp4},</if>
         <if test="exp5 != null and exp5 != ''">exp5=#{exp5},</if>
+        <if test="remark != null">remark=#{remark},</if>
         wordbook_code=#{wordbook_code}
         where wordbook_sign = #{wordbook_sign} and wordbook_code= #{wordbook_code}
     </update>
@@ -35,6 +36,7 @@
         <if test="exp3 != null and exp3 != ''">exp3,</if>
         <if test="exp4 != null and exp4 != ''">exp4,</if>
         <if test="exp5 != null and exp5 != ''">exp5,</if>
+        <if test="remark != null and remark != ''">remark,</if>
         wordbook_sign,wordbook_code
         )values(
         <if test="wordbook_name != null and wordbook_name != ''">#{wordbook_name},</if>
@@ -44,6 +46,7 @@
         <if test="exp3 != null and exp3 != ''">#{exp3},</if>
         <if test="exp4 != null and exp4 != ''">#{exp4},</if>
         <if test="exp5 != null and exp5 != ''">#{exp5},</if>
+        <if test="remark != null and remark != ''">#{remark},</if>
                 #{wordbook_sign},#{wordbook_code}
         )
     </insert>

blood_bus/src/main/resources/mapper/XkPatientInfoMapper.xml

@@ -8,6 +8,9 @@
             <if test="beinhos_id != null and beinhos_id != ''">and beinhos_id = #{beinhos_id}</if>
         </where>
     </select>
+    <select id="queryOne" resultType="com.czblood.bus.pojo.XkPatientInfo">
+        select * from xk_patient_info where beinhos_id = #{beinhos_id}
+    </select>
 
     <insert id="insertXkPatientInfo">
         insert into xk_patient_info(

blood_bus/src/main/resources/mapper/XkTransfuseApplyTestitemMapper.xml

@@ -13,14 +13,14 @@
         <if test="Item_unit != null and Item_unit != ''">Item_unit,</if>
         <if test="test_date != null">test_date,</if>
         <if test="upload_flag != null and upload_flag != ''">upload_flag,</if>
-        bill_no,sid
+        bill_no,sid,hos_id
         )values (
         <if test="item_name != null and item_name != ''">#{item_name},</if>
         <if test="item_result != null and item_result != ''">#{item_result},</if>
         <if test="Item_unit != null and Item_unit != ''">#{Item_unit},</if>
         <if test="test_date != null ">#{test_date},</if>
         <if test="upload_flag != null and upload_flag != ''">#{upload_flag},</if>
-                 #{bill_no},#{sid}
+                 #{bill_no},#{sid},#{hos_id}
         )
     </insert>
 
@@ -30,7 +30,7 @@
         <if test="Item_unit != null and Item_unit != ''">Item_unit=#{Item_unit},</if>
         <if test="test_date != null">test_date=#{test_date},</if>
         <if test="upload_flag != null and upload_flag != ''">upload_flag=#{upload_flag},</if>
-        item_name=#{item_name}
+        item_name=#{item_name},hos_id = #{hos_id}
         where bill_no=#{bill_no}
         <if test="sid != null">and sid=#{sid}</if>
     </update>

blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/controller/XkDmzdController.java

@@ -17,7 +17,7 @@ import java.util.stream.Collectors;
 
 @Api(tags = "代码字典")
 @RestController
-@RequestMapping("/bus/bloodbank")
+@RequestMapping("/bus/bloodbank/dmzd")
 public class XkDmzdController extends BaseController {
 
     @Resource
@@ -39,9 +39,7 @@ public class XkDmzdController extends BaseController {
     public Result addDmzd(@RequestBody XkDmzd xkDmzd){
         xkDmzdMapper.insertXkDmzd(xkDmzd);
         //写缓存
-        String wordbookSign = xkDmzd.getWordbook_sign();
+        bloodBankUtil.setDictCacheList(xkDmzd.getWordbook_sign());
-        List<XkDmzd> xkDmzdList = xkDmzdMapper.queryList(xkDmzd);
-        DmzdCache.setDictCache(wordbookSign,xkDmzdList);
         return new Result("0","添加成功！");
     }
 

blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/controller/XkParameterController.java

@@ -0,0 +1,11 @@
+package com.czblood.busBloodbank.controller;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "系统参数")
+@RestController
+@RequestMapping("/bus/bloodbank/parameter")
+public class XkParameterController {
+}

blood_bus_doctor/src/main/java/com/czblood/busDoctor/controller/TransfuseApplyBeforeController.java

@@ -5,6 +5,7 @@ import com.czblood.bus.pojo.XkTransfuseApplyBefore;
 import com.czblood.busDoctor.pojo.TransfuseApplyBeforeDTO;
 import com.czblood.busDoctor.service.TransfuseApplyBeforeService;
 import com.czblood.common.annotation.Log;
+import com.czblood.common.core.controller.BaseController;
 import com.czblood.common.core.domain.Result;
 import com.czblood.common.enums.BusinessType;
 import io.swagger.annotations.Api;
@@ -16,9 +17,9 @@ import javax.annotation.Resource;
 
 @Api(tags = "输血前评估")
 @RestController
-@RequestMapping("/doctor/applyBefore")
+@RequestMapping("/bus/doctor/applyBefore")
 @Slf4j
-public class TransfuseApplyBeforeController {
+public class TransfuseApplyBeforeController extends BaseController {
 
     @Resource
     private TransfuseApplyBeforeService transfuseApplyBeforeService;
@@ -39,6 +40,14 @@ public class TransfuseApplyBeforeController {
     @ApiOperation("保存信息")
     @PostMapping("/save")
     public Result save(@RequestBody TransfuseApplyBeforeDTO transfuseApplyBeforeDTO){
+        transfuseApplyBeforeDTO.getXkPatientInfo().setHos_id(getLoginUser().getSysLoginParam().getLoginYLJG());
+        transfuseApplyBeforeDTO.getXkTransfuseApply().setHos_id(getLoginUser().getSysLoginParam().getLoginYLJG());
+        transfuseApplyBeforeDTO.getXkTransfuseApplyBeforeList().forEach(xkTransfuseApplyBefore -> {
+            xkTransfuseApplyBefore.setHos_id(getLoginUser().getSysLoginParam().getLoginYLJG());
+        });
+        transfuseApplyBeforeDTO.getXkTransfuseApplyTestitemList().forEach(xkTransfuseApplyTestitem -> {
+            xkTransfuseApplyTestitem.setHos_id(getLoginUser().getSysLoginParam().getLoginYLJG());
+        });
     	return transfuseApplyBeforeService.save(transfuseApplyBeforeDTO);
     }
 

blood_bus_doctor/src/main/java/com/czblood/busDoctor/controller/TransfuseApplyController.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @Api(tags = "输血申请")
 @RestController
-@RequestMapping("/doctor/apply")
+@RequestMapping("/bus/doctor/apply")
 @Slf4j
 public class TransfuseApplyController {
 }

blood_bus_doctor/src/main/java/com/czblood/busDoctor/service/impl/TransfuseApplyBeforeServiceImpl.java

@@ -113,7 +113,7 @@ public class TransfuseApplyBeforeServiceImpl implements TransfuseApplyBeforeServ
         Result result = BloodInterfaceUtil.invokeBloodInterface(beforeAssessRequest);
         if(!result.getCode().equals("0")) return result;
 
-        return new Result("0","保存成功！");
+        return new Result("0","保存成功！",billNo);
     }
 
     @Override

blood_bus_doctor/src/main/java/com/czblood/busDoctor/utils/TransfuseApplyBeforeUtil.java

@@ -26,7 +26,11 @@ public class TransfuseApplyBeforeUtil {
     @Transactional
     public void saveTransfuseApplyBeforeDTO(TransfuseApplyBeforeDTO transfuseApplyBeforeDTO){
         XkPatientInfo xkPatientInfo = transfuseApplyBeforeDTO.getXkPatientInfo();
-        xkPatientInfoMapper.insertXkPatientInfo(xkPatientInfo);
+        String beinhosId = xkPatientInfo.getBeinhos_id();
+        XkPatientInfo xkPatientInfo1 = xkPatientInfoMapper.queryOne(beinhosId);
+        if(xkPatientInfo1 == null) {
+            xkPatientInfoMapper.insertXkPatientInfo(xkPatientInfo);
+        }
         List<XkTransfuseApplyBefore> xkTransfuseApplyBeforeList = transfuseApplyBeforeDTO.getXkTransfuseApplyBeforeList();
         if(xkTransfuseApplyBeforeList.size() > 0){
             XkTransfuseApplyBefore xkTransfuseApplyBefore = xkTransfuseApplyBeforeList.get(0);

sql/updatedb_blood.sql

@@ -281,10 +281,26 @@ if not exists(select 1 from dbo.xk_dmzd where wordbook_sign = 'BASE')
         INSERT INTO dbo.xk_dmzd (wordbook_sign, wordbook_code, sid, wordbook_name, remark, exp1, exp2, exp3, exp4, use_sign, last_modified, exp5)
         VALUES ('BASE', 'zlfy', NULL, '输血治疗不良反应维护', NULL, NULL, NULL, NULL, NULL, 'Y', NULL, NULL)
 
+        insert into xk_dmzd(wordbook_sign,wordbook_code,wordbook_name,use_sign) values('BASE','sxqjcxmmrz','输血前检查项目默认值','Y')
+
+        insert into xk_dmzd(wordbook_sign,wordbook_code,wordbook_name,use_sign) values
+                                                                                    ('sxqjcxmmrz','+','+','Y'),
+                                                                                    ('sxqjcxmmrz','-','-','Y'),
+                                                                                    ('sxqjcxmmrz','未查','未查','Y'),
+                                                                                    ('sxqjcxmmrz','已查未报','已查未报','Y')
+
+
     END
 
 IF NOT EXISTS (SELECT 1 FROM sys.key_constraints WHERE name = 'PK_xk_dmzd' AND type = 'PK' )
     BEGIN
         ALTER TABLE xk_dmzd ADD CONSTRAINT PK_xk_dmzd PRIMARY KEY CLUSTERED (wordbook_sign,wordbook_code);
     END
+GO
+
+
+IF NOT EXISTS (SELECT 1 FROM sys.key_constraints WHERE name = 'PK_xk_patient_info' AND type = 'PK' )
+    BEGIN
+        ALTER TABLE xk_patient_info ADD CONSTRAINT PK_xk_patient_info PRIMARY KEY CLUSTERED (beinhos_id);
+    END
 GO