zjh
2024-03-06 b814abb328d65253e1ecf0a2ed1055d09506c414
zjh 本地 2024/03/6 -1
4个文件已修改
13 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHybgd.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -652,6 +652,9 @@
                if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
                    for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                        if(remark.getProId().equals(tjOrderDetail.getProId())){
                            if(null !=tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")){
                                tjOrderDetail.setProResult(tjOrderDetail.getProResult()+" ["+tjOrderDetail.getYcbz()+"]");
                            }
                            dels.add(tjOrderDetail);
                        }
                    }
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -835,7 +835,11 @@
                    if(entry.getKey().getProId().equals(tjOrderDetail.getProId())){
                        TjPdfVO tjPdfVO = new TjPdfVO();
                        tjPdfVO.setProName(tjOrderDetail.getProName());
                        tjPdfVO.setProResult(tjOrderDetail.getProResult());
                        if(null !=tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")){
                            tjPdfVO.setProResult(tjOrderDetail.getProResult()+" ["+tjOrderDetail.getYcbz()+"]");
                        }else {
                            tjPdfVO.setProResult(tjOrderDetail.getProResult());
                        }
                        tjPdfVO.setExc(tjOrderDetail.getExceptionDesc());
                        tjPdfVO.setStandardValue(tjOrderDetail.getStanId());
                        tjPdfVO.setCompany(tjOrderDetail.getProAdvice());
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
@@ -210,6 +210,9 @@
    @TableField(exist = false)
    private String cusName;
    @TableField(exist = false)
    private String ycbz;
    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHybgd.java
@@ -23,4 +23,5 @@
    private String shsj;
    private String shys;
    private String tpurl;
    private String ycbz;
}